Merge branch 'develop' into fix-projectoptions-closing

Author: raclim

client/modules/IDE/components/QuickAddList/QuickAddList.jsx

@@ -10,8 +10,21 @@ const Item = ({ isAdded, onSelect, name, url }) => {
   const buttonLabel = isAdded
     ? t('QuickAddList.ButtonRemoveARIA')
     : t('QuickAddList.ButtonAddToCollectionARIA');
+
+  const handleKeyDown = (event) => {
+    if (event.key === 'Enter' || event.key === ' ') {
+      onSelect(event);
+    }
+  };
+
   return (
-    <li className="quick-add__item" onClick={onSelect}> { /* eslint-disable-line */ }
+    <div
+      role="button"
+      className="quick-add__item"
+      onClick={onSelect}
+      onKeyDown={handleKeyDown}
+      tabIndex={0}
+    >
       <button
         className="quick-add__item-toggle"
         onClick={onSelect}
@@ -28,7 +41,7 @@ const Item = ({ isAdded, onSelect, name, url }) => {
       >
         {t('QuickAddList.View')}
       </Link>
-    </li>
+    </div>
   );
 };
 

client/modules/IDE/components/Searchbar/Collection.jsx

@@ -1,25 +1,33 @@
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import i18next from 'i18next';
 import * as SortingActions from '../../actions/sorting';
 
 import Searchbar from './Searchbar';
 
 const scope = 'collection';
 
-function mapStateToProps(state) {
-  return {
-    searchLabel: i18next.t('Searchbar.SearchCollection'),
-    searchTerm: state.search[`${scope}SearchTerm`]
+const SearchbarContainer = () => {
+  const dispatch = useDispatch();
+  const searchLabel = i18next.t('Searchbar.SearchCollection');
+  const searchTerm = useSelector((state) => state.search[`${scope}SearchTerm`]);
+
+  const setSearchTerm = (term) => {
+    dispatch(SortingActions.setSearchTerm(scope, term));
   };
-}
 
-function mapDispatchToProps(dispatch) {
-  const actions = {
-    setSearchTerm: (term) => SortingActions.setSearchTerm(scope, term),
-    resetSearchTerm: () => SortingActions.resetSearchTerm(scope)
+  const resetSearchTerm = () => {
+    dispatch(SortingActions.resetSearchTerm(scope));
   };
-  return bindActionCreators(Object.assign({}, actions), dispatch);
-}
 
-export default connect(mapStateToProps, mapDispatchToProps)(Searchbar);
+  return (
+    <Searchbar
+      searchLabel={searchLabel}
+      searchTerm={searchTerm}
+      setSearchTerm={setSearchTerm}
+      resetSearchTerm={resetSearchTerm}
+    />
+  );
+};
+
+export default SearchbarContainer;

client/modules/IDE/components/Searchbar/Searchbar.jsx

@@ -1,24 +1,24 @@
 import React, { useState, useCallback, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { throttle } from 'lodash';
-import { withTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
 import i18next from 'i18next';
 import SearchIcon from '../../../../images/magnifyingglass.svg';
 
 const Searchbar = ({
   searchTerm,
   setSearchTerm,
   resetSearchTerm,
-  searchLabel,
-  t
+  searchLabel
 }) => {
+  const { t } = useTranslation();
   const [searchValue, setSearchValue] = useState(searchTerm);
 
   const throttledSearchChange = useCallback(
     throttle((value) => {
       setSearchTerm(value.trim());
     }, 500),
-    []
+    [setSearchTerm]
   );
 
   const handleResetSearch = () => {
@@ -65,12 +65,11 @@ Searchbar.propTypes = {
   searchTerm: PropTypes.string.isRequired,
   setSearchTerm: PropTypes.func.isRequired,
   resetSearchTerm: PropTypes.func.isRequired,
-  searchLabel: PropTypes.string,
-  t: PropTypes.func.isRequired
+  searchLabel: PropTypes.string
 };
 
 Searchbar.defaultProps = {
   searchLabel: i18next.t('Searchbar.SearchSketch')
 };
 
-export default withTranslation()(Searchbar);
+export default Searchbar;

client/modules/IDE/components/Searchbar/Sketch.jsx

@@ -1,25 +1,32 @@
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import i18next from 'i18next';
 import * as SortingActions from '../../actions/sorting';
-
 import Searchbar from './Searchbar';
 
 const scope = 'sketch';
 
-function mapStateToProps(state) {
-  return {
-    searchLabel: i18next.t('Searchbar.SearchSketch'),
-    searchTerm: state.search[`${scope}SearchTerm`]
+const SearchbarContainer = () => {
+  const dispatch = useDispatch();
+  const searchLabel = i18next.t('Searchbar.SearchSketch');
+  const searchTerm = useSelector((state) => state.search[`${scope}SearchTerm`]);
+
+  const setSearchTerm = (term) => {
+    dispatch(SortingActions.setSearchTerm(scope, term));
   };
-}
 
-function mapDispatchToProps(dispatch) {
-  const actions = {
-    setSearchTerm: (term) => SortingActions.setSearchTerm(scope, term),
-    resetSearchTerm: () => SortingActions.resetSearchTerm(scope)
+  const resetSearchTerm = () => {
+    dispatch(SortingActions.resetSearchTerm(scope));
   };
-  return bindActionCreators(Object.assign({}, actions), dispatch);
-}
 
-export default connect(mapStateToProps, mapDispatchToProps)(Searchbar);
+  return (
+    <Searchbar
+      searchLabel={searchLabel}
+      searchTerm={searchTerm}
+      setSearchTerm={setSearchTerm}
+      resetSearchTerm={resetSearchTerm}
+    />
+  );
+};
+
+export default SearchbarContainer;

client/modules/User/components/LoginForm.jsx

@@ -57,6 +57,14 @@ function LoginForm() {
                   {t('LoginForm.Password')}
                 </label>
                 <div className="form__field__password">
+                  <input
+                    className="form__input"
+                    aria-label={t('LoginForm.PasswordARIA')}
+                    type={showPassword ? 'text' : 'password'}
+                    id="password"
+                    autoComplete="current-password"
+                    {...field.input}
+                  />
                   <button
                     className="form__eye__icon"
                     type="button"
@@ -69,14 +77,6 @@ function LoginForm() {
                       <AiOutlineEye />
                     )}
                   </button>
-                  <input
-                    className="form__input"
-                    aria-label={t('LoginForm.PasswordARIA')}
-                    type={showPassword ? 'text' : 'password'}
-                    id="password"
-                    autoComplete="current-password"
-                    {...field.input}
-                  />
                 </div>
                 {field.meta.touched && field.meta.error && (
                   <span className="form-error" aria-live="polite">

client/modules/User/components/SignupForm.jsx

@@ -113,6 +113,14 @@ function SignupForm() {
                   {t('SignupForm.Password')}
                 </label>
                 <div className="form__field__password">
+                  <input
+                    className="form__input"
+                    aria-label={t('SignupForm.PasswordARIA')}
+                    type={showPassword ? 'text' : 'password'}
+                    id="password"
+                    autoComplete="new-password"
+                    {...field.input}
+                  />
                   <button
                     className="form__eye__icon"
                     type="button"
@@ -125,14 +133,6 @@ function SignupForm() {
                       <AiOutlineEye />
                     )}
                   </button>
-                  <input
-                    className="form__input"
-                    aria-label={t('SignupForm.PasswordARIA')}
-                    type={showPassword ? 'text' : 'password'}
-                    id="password"
-                    autoComplete="new-password"
-                    {...field.input}
-                  />
                 </div>
                 {field.meta.touched && field.meta.error && (
                   <span className="form-error" aria-live="polite">
@@ -149,6 +149,14 @@ function SignupForm() {
                   {t('SignupForm.ConfirmPassword')}
                 </label>
                 <div className="form__field__password">
+                  <input
+                    className="form__input"
+                    type={showConfirmPassword ? 'text' : 'password'}
+                    aria-label={t('SignupForm.ConfirmPasswordARIA')}
+                    id="confirmPassword" // Match the id with htmlFor
+                    autoComplete="new-password"
+                    {...field.input}
+                  />
                   <button
                     className="form__eye__icon"
                     type="button"
@@ -161,14 +169,6 @@ function SignupForm() {
                       <AiOutlineEye />
                     )}
                   </button>
-                  <input
-                    className="form__input"
-                    type={showConfirmPassword ? 'text' : 'password'}
-                    aria-label={t('SignupForm.ConfirmPasswordARIA')}
-                    id="confirmPassword" // Match the id with htmlFor
-                    autoComplete="new-password"
-                    {...field.input}
-                  />
                 </div>
                 {field.meta.touched && field.meta.error && (
                   <span className="form-error" aria-live="polite">