ref: Little refactoring

client/src/components/BoardMembershipsStep/BoardMembershipsStep.jsx

@@ -12,18 +12,18 @@ import styles from './BoardMembershipsStep.module.scss';
 const BoardMembershipsStep = React.memo(
   ({ items, currentUserIds, title, onUserSelect, onUserDeselect, onBack }) => {
     const [t] = useTranslation();
-    const [searchValue, handleSearchFieldChange] = useField('');
-    const search = useMemo(() => searchValue.trim().toLowerCase(), [searchValue]);
+    const [search, handleSearchChange] = useField('');
+    const cleanSearch = useMemo(() => search.trim().toLowerCase(), [search]);
 
     const filteredItems = useMemo(
       () =>
         items.filter(
           ({ user }) =>
-            user.email.includes(search) ||
-            user.name.toLowerCase().includes(search) ||
-            (user.username && user.username.includes(search)),
+            user.email.includes(cleanSearch) ||
+            user.name.toLowerCase().includes(cleanSearch) ||
+            (user.username && user.username.includes(cleanSearch)),
         ),
-      [items, search],
+      [items, cleanSearch],
     );
 
     const searchField = useRef(null);
@@ -48,15 +48,19 @@ const BoardMembershipsStep = React.memo(
 
     return (
       <>
-        <Popup.Header onBack={onBack}>{t(title)}</Popup.Header>
+        <Popup.Header onBack={onBack}>
+          {t(title, {
+            context: 'title',
+          })}
+        </Popup.Header>
         <Popup.Content>
           <Input
             fluid
             ref={searchField}
-            value={searchValue}
+            value={search}
             placeholder={t('common.searchMembers')}
             icon="search"
-            onChange={handleSearchFieldChange}
+            onChange={handleSearchChange}
           />
           {filteredItems.length > 0 && (
             <Menu secondary vertical className={styles.menu}>

client/src/components/CardMoveStep/CardMoveStep.jsx

@@ -36,7 +36,7 @@ const CardMoveStep = React.memo(
       [selectedBoard, path.listId],
     );
 
-    const handleBoardIdFieldChange = useCallback(
+    const handleBoardIdChange = useCallback(
       (event, data) => {
         if (selectedProject.boards.find((board) => board.id === data.value).isFetching === null) {
           onBoardFetch(data.value);
@@ -102,7 +102,7 @@ const CardMoveStep = React.memo(
                   }
                   disabled={selectedProject.boards.length === 0}
                   className={styles.field}
-                  onChange={handleBoardIdFieldChange}
+                  onChange={handleBoardIdChange}
                 />
               </>
             )}

client/src/components/Header/NotificationsPopup.jsx

@@ -74,7 +74,11 @@ const NotificationsStep = React.memo(({ items, onDelete, onClose }) => {
 
   return (
     <>
-      <Popup.Header>{t('common.notifications')}</Popup.Header>
+      <Popup.Header>
+        {t('common.notifications', {
+          context: 'title',
+        })}
+      </Popup.Header>
       <Popup.Content>
         {items.length > 0
           ? items.map((item) => (

client/src/components/LabelsStep/LabelsStep.jsx

@@ -21,17 +21,17 @@ const LabelsStep = React.memo(
   ({ items, currentIds, title, onSelect, onDeselect, onCreate, onUpdate, onDelete, onBack }) => {
     const [t] = useTranslation();
     const [step, openStep, handleBack] = useSteps();
-    const [searchValue, handleSearchFieldChange] = useField('');
-    const search = useMemo(() => searchValue.trim().toLowerCase(), [searchValue]);
+    const [search, handleSearchChange] = useField('');
+    const cleanSearch = useMemo(() => search.trim().toLowerCase(), [search]);
 
     const filteredItems = useMemo(
       () =>
         items.filter(
           (label) =>
-            (label.name && label.name.toLowerCase().includes(search)) ||
-            label.color.includes(search),
+            (label.name && label.name.toLowerCase().includes(cleanSearch)) ||
+            label.color.includes(cleanSearch),
         ),
-      [items, search],
+      [items, cleanSearch],
     );
 
     const searchField = useRef(null);
@@ -109,15 +109,19 @@ const LabelsStep = React.memo(
 
     return (
       <>
-        <Popup.Header onBack={onBack}>{t(title)}</Popup.Header>
+        <Popup.Header onBack={onBack}>
+          {t(title, {
+            context: 'title',
+          })}
+        </Popup.Header>
         <Popup.Content>
           <Input
             fluid
             ref={searchField}
-            value={searchValue}
+            value={search}
             placeholder={t('common.searchLabels')}
             icon="search"
-            onChange={handleSearchFieldChange}
+            onChange={handleSearchChange}
           />
           {filteredItems.length > 0 && (
             <div className={styles.items}>

client/src/components/Memberships/AddPopup/AddPopup.jsx

@@ -17,18 +17,18 @@ const AddStep = React.memo(
   ({ users, currentUserIds, permissionsSelectStep, title, onCreate, onClose }) => {
     const [t] = useTranslation();
     const [step, openStep, handleBack] = useSteps();
-    const [searchValue, handleSearchFieldChange] = useField('');
-    const search = useMemo(() => searchValue.trim().toLowerCase(), [searchValue]);
+    const [search, handleSearchChange] = useField('');
+    const cleanSearch = useMemo(() => search.trim().toLowerCase(), [search]);
 
     const filteredUsers = useMemo(
       () =>
         users.filter(
           (user) =>
-            user.email.includes(search) ||
-            user.name.toLowerCase().includes(search) ||
-            (user.username && user.username.includes(search)),
+            user.email.includes(cleanSearch) ||
+            user.name.toLowerCase().includes(cleanSearch) ||
+            (user.username && user.username.includes(cleanSearch)),
         ),
-      [users, search],
+      [users, cleanSearch],
     );
 
     const searchField = useRef(null);
@@ -102,10 +102,10 @@ const AddStep = React.memo(
           <Input
             fluid
             ref={searchField}
-            value={searchValue}
+            value={search}
             placeholder={t('common.searchUsers')}
             icon="search"
-            onChange={handleSearchFieldChange}
+            onChange={handleSearchChange}
           />
           {filteredUsers.length > 0 && (
             <div className={styles.users}>

client/src/locales/ru/core.js

@@ -137,7 +137,7 @@ export default {
       time: 'Время',
       timer: 'Таймер',
       title: 'Название',
-      userActions_title: 'Действия с пользователем',
+      userActions: 'Действия с пользователем',
       userAddedThisCardToList: '<0>{{user}}</0><1> добавил(а) эту карточку в {{list}}</1>',
       userLeftNewCommentToCard: '{{user}} оставил(а) комментарий «{{comment}}» к <2>{{card}}</2>',
       userMovedCardFromListToList:

server/db/migrations/20220725150723_add_language_to_user_account_table.js

@@ -1,11 +1,11 @@
-module.exports.up = async (knex) =>
+module.exports.up = (knex) =>
   knex.schema.table('user_account', (table) => {
     /* Columns */
 
     table.text('language');
   });
 
-module.exports.down = async (knex) =>
+module.exports.down = (knex) =>
   knex.schema.table('user_account', (table) => {
     table.dropColumn('language');
   });

server/db/migrations/20220803221221_add_password_changed_at_to_user_account_table.js

@@ -1,11 +1,11 @@
-module.exports.up = async (knex) =>
+module.exports.up = (knex) =>
   knex.schema.table('user_account', (table) => {
     /* Columns */
 
     table.timestamp('password_changed_at', true);
   });
 
-module.exports.down = async (knex) =>
+module.exports.down = (knex) =>
   knex.schema.table('user_account', (table) => {
     table.dropColumn('password_changed_at');
   });