ref: Little refactoring

2025-12-20 09:15:39 +03:00 · 2025-08-30 17:09:17 +02:00
parent 60a94f33fc
commit 4c5c7799f2
42 changed files with 89 additions and 19 deletions
--- a/client/src/components/attachments/Attachments/ItemContent.jsx
+++ b/client/src/components/attachments/Attachments/ItemContent.jsx
@@ -16,7 +16,7 @@ import { usePopupInClosableContext } from '../../../hooks';
 import { isListArchiveOrTrash } from '../../../utils/record-helpers';
 import { AttachmentTypes, BoardMembershipRoles } from '../../../constants/Enums';
 import EditStep from './EditStep';
-import Favicon from './Favicon';
+import Favicon from '../../common/Favicon';
 import TimeAgo from '../../common/TimeAgo';

 import styles from './ItemContent.module.scss';
@@ -131,7 +131,11 @@ const ItemContent = React.forwardRef(({ id, onOpen }, ref) => {
          <span className={styles.options}>
            <button type="button" className={styles.option} onClick={handleDownloadClick}>
              <Icon name="download" size="small" className={styles.optionIcon} />
-              <span className={styles.optionText}>Download</span>
+              <span className={styles.optionText}>
+                {t('action.download', {
+                  context: 'title',
+                })}
+              </span>
            </button>
            {attachment.data.image && canEdit && (
              <button type="button" className={styles.option} onClick={handleToggleCoverClick}>
--- a/client/src/components/attachments/Attachments/Favicon.jsx
+++ b/client/src/components/attachments/Attachments/Favicon.jsx
--- a/client/src/components/attachments/Attachments/Favicon.module.scss
+++ b/client/src/components/attachments/Attachments/Favicon.module.scss
--- a/client/src/components/common/Favicon/index.js
+++ b/client/src/components/common/Favicon/index.js
@@ -0,0 +1,8 @@
+/*!
+ * Copyright (c) 2024 PLANKA Software GmbH
+ * Licensed under the Fair Use License: https://github.com/plankanban/planka/blob/master/LICENSE.md
+ */
+
+import Favicon from './Favicon';
+
+export default Favicon;
--- a/client/src/components/common/Header/Header.jsx
+++ b/client/src/components/common/Header/Header.jsx
@@ -73,14 +73,14 @@ const Header = React.memo(() => {

  const dispatch = useDispatch();

-  const handleToggleEditModeClick = useCallback(() => {
-    dispatch(entryActions.toggleEditMode(!isEditModeEnabled));
-  }, [isEditModeEnabled, dispatch]);
-
  const handleToggleFavoritesClick = useCallback(() => {
    dispatch(entryActions.toggleFavorites(!isFavoritesEnabled));
  }, [isFavoritesEnabled, dispatch]);

+  const handleToggleEditModeClick = useCallback(() => {
+    dispatch(entryActions.toggleEditMode(!isEditModeEnabled));
+  }, [isEditModeEnabled, dispatch]);
+
  const handleProjectSettingsClick = useCallback(() => {
    if (!canEditProject) {
      return;
--- a/client/src/locales/ar-YE/core.js
+++ b/client/src/locales/ar-YE/core.js
@@ -377,6 +377,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: 'تكرار البطاقة',
      edit: 'تعديل',
      editColor_title: null,
--- a/client/src/locales/bg-BG/core.js
+++ b/client/src/locales/bg-BG/core.js
@@ -382,6 +382,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: 'Дублирана карта',
      edit: 'Редактиране',
      editColor_title: null,
--- a/client/src/locales/cs-CZ/core.js
+++ b/client/src/locales/cs-CZ/core.js
@@ -392,6 +392,7 @@ export default {
      deleteUser_title: 'Smazat uživatele',
      deleteWebhook: null,
      dismissAll: 'Vše přečteno',
+      download: null,
      duplicateCard_title: 'Duplikovat kartu',
      edit: 'Upravit',
      editColor_title: 'Upravit barvu',
--- a/client/src/locales/da-DK/core.js
+++ b/client/src/locales/da-DK/core.js
@@ -402,6 +402,7 @@ export default {
      deleteUser_title: 'Slet bruger',
      deleteWebhook: null,
      dismissAll: 'Afvis alle',
+      download: null,
      duplicateCard_title: 'Duplikér kort',
      edit: 'Rediger',
      editColor_title: 'Rediger farve',
--- a/client/src/locales/de-DE/core.js
+++ b/client/src/locales/de-DE/core.js
@@ -407,6 +407,7 @@ export default {
      deleteUser_title: 'Benutzer löschen',
      deleteWebhook: null,
      dismissAll: 'Alle verwerfen',
+      download: null,
      duplicateCard_title: 'Karte duplizieren',
      edit: 'Bearbeiten',
      editColor_title: 'Farbe bearbeiten',
--- a/client/src/locales/el-GR/core.js
+++ b/client/src/locales/el-GR/core.js
@@ -418,6 +418,7 @@ export default {
      deleteUser_title: 'Διαγραφή χρήστη',
      deleteWebhook: null,
      dismissAll: 'Απόρριψη όλων',
+      download: null,
      duplicateCard_title: 'Διπλασιασμός κάρτας',
      edit: 'Επεξεργασία',
      editColor_title: 'Επεξεργασία χρώματος',
--- a/client/src/locales/en-GB/core.js
+++ b/client/src/locales/en-GB/core.js
@@ -401,6 +401,7 @@ export default {
      deleteUser_title: 'Delete User',
      deleteWebhook: 'Delete webhook',
      dismissAll: 'Dismiss all',
+      download: 'Download',
      duplicateCard_title: 'Duplicate Card',
      edit: 'Edit',
      editColor_title: 'Edit Color',
--- a/client/src/locales/en-US/core.js
+++ b/client/src/locales/en-US/core.js
@@ -396,6 +396,7 @@ export default {
      deleteUser_title: 'Delete User',
      deleteWebhook: 'Delete webhook',
      dismissAll: 'Dismiss all',
+      download: 'Download',
      duplicateCard_title: 'Duplicate Card',
      edit: 'Edit',
      editColor_title: 'Edit Color',
--- a/client/src/locales/es-ES/core.js
+++ b/client/src/locales/es-ES/core.js
@@ -401,6 +401,7 @@ export default {
      deleteUser_title: 'Borrar Usuario',
      deleteWebhook: null,
      dismissAll: 'Descartar todo',
+      download: null,
      duplicateCard_title: 'Duplicar tarjeta',
      edit: 'Editar',
      editColor_title: 'Editar color',
--- a/client/src/locales/et-EE/core.js
+++ b/client/src/locales/et-EE/core.js
@@ -400,6 +400,7 @@ export default {
      deleteUser_title: 'Kustuta kasutaja',
      deleteWebhook: null,
      dismissAll: 'Eemalda kõik',
+      download: null,
      duplicateCard_title: 'Duplikaardi loomine',
      edit: 'Muuda',
      editColor_title: 'Muuda värvi',
--- a/client/src/locales/fa-IR/core.js
+++ b/client/src/locales/fa-IR/core.js
@@ -379,6 +379,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: 'تکرار کارت',
      edit: 'ویرایش',
      editColor_title: null,
--- a/client/src/locales/fi-FI/core.js
+++ b/client/src/locales/fi-FI/core.js
@@ -400,6 +400,7 @@ export default {
      deleteUser_title: 'Poista käyttäjä',
      deleteWebhook: null,
      dismissAll: 'Sulje kaikki',
+      download: null,
      duplicateCard_title: 'Monista kortti',
      edit: 'Muokkaa',
      editColor_title: 'Muokkaa väriä',
--- a/client/src/locales/fr-FR/core.js
+++ b/client/src/locales/fr-FR/core.js
@@ -404,6 +404,7 @@ export default {
      deleteUser_title: 'Supprimer l’utilisateur',
      deleteWebhook: 'Supprimer le webhook',
      dismissAll: 'Tout rejeter',
+      download: null,
      duplicateCard_title: 'Dupliquer la carte',
      edit: 'Modifier',
      editColor_title: 'Modifier la couleur',
--- a/client/src/locales/hu-HU/core.js
+++ b/client/src/locales/hu-HU/core.js
@@ -401,6 +401,7 @@ export default {
      deleteUser_title: 'Felhasználó törlése',
      deleteWebhook: 'Webhook törlése',
      dismissAll: 'Összes elvetése',
+      download: null,
      duplicateCard_title: 'Kártya másolása',
      edit: 'Szerkesztés',
      editColor_title: null,
--- a/client/src/locales/id-ID/core.js
+++ b/client/src/locales/id-ID/core.js
@@ -381,6 +381,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: null,
      edit: 'Ubah',
      editColor_title: null,
--- a/client/src/locales/it-IT/core.js
+++ b/client/src/locales/it-IT/core.js
@@ -402,6 +402,7 @@ export default {
      deleteUser_title: 'Elimina utente',
      deleteWebhook: 'Elimina webhook',
      dismissAll: 'Ignora tutto',
+      download: null,
      duplicateCard_title: 'Duplica scheda',
      edit: 'Modifica',
      editColor_title: 'Modifica colore',
--- a/client/src/locales/ja-JP/core.js
+++ b/client/src/locales/ja-JP/core.js
@@ -381,6 +381,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: null,
      edit: '編集',
      editColor_title: null,
--- a/client/src/locales/ko-KR/core.js
+++ b/client/src/locales/ko-KR/core.js
@@ -380,6 +380,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: '모두 해제',
+      download: null,
      duplicateCard_title: '카드 복제',
      edit: '편집',
      editColor_title: '색상 편집',
--- a/client/src/locales/nl-NL/core.js
+++ b/client/src/locales/nl-NL/core.js
@@ -382,6 +382,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: null,
      edit: 'Bewerken',
      editColor_title: null,
--- a/client/src/locales/pl-PL/core.js
+++ b/client/src/locales/pl-PL/core.js
@@ -392,6 +392,7 @@ export default {
      deleteUser_title: 'Usuń Użytkownika',
      deleteWebhook: null,
      dismissAll: 'Odrzuć wszystkie',
+      download: null,
      duplicateCard_title: 'Duplikuj Kartę',
      edit: 'Edytuj',
      editColor_title: 'Edytuj Kolor',
--- a/client/src/locales/pt-BR/core.js
+++ b/client/src/locales/pt-BR/core.js
@@ -404,6 +404,7 @@ export default {
      deleteUser_title: 'Excluir Usuário',
      deleteWebhook: 'Excluir webhook',
      dismissAll: 'Dispensar todos',
+      download: null,
      duplicateCard_title: 'Duplicar Cartão',
      edit: 'Editar',
      editColor_title: 'Editar Cor',
--- a/client/src/locales/pt-PT/core.js
+++ b/client/src/locales/pt-PT/core.js
@@ -383,6 +383,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: null,
      edit: 'Editar',
      editColor_title: null,
--- a/client/src/locales/ro-RO/core.js
+++ b/client/src/locales/ro-RO/core.js
@@ -382,6 +382,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: null,
      edit: 'Editați',
      editColor_title: null,
--- a/client/src/locales/ru-RU/core.js
+++ b/client/src/locales/ru-RU/core.js
@@ -396,6 +396,7 @@ export default {
      deleteUser_title: 'Удалить пользователя',
      deleteWebhook: null,
      dismissAll: 'Отклонить все',
+      download: null,
      duplicateCard_title: 'Дублировать карточку',
      edit: 'Изменить',
      editColor_title: 'Изменить цвет',
--- a/client/src/locales/sk-SK/core.js
+++ b/client/src/locales/sk-SK/core.js
@@ -381,6 +381,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: null,
      edit: 'Upraviť',
      editColor_title: null,
--- a/client/src/locales/sr-Cyrl-RS/core.js
+++ b/client/src/locales/sr-Cyrl-RS/core.js
@@ -381,6 +381,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: 'Клонирај картицу',
      edit: 'Измени',
      editColor_title: null,
--- a/client/src/locales/sr-Latn-RS/core.js
+++ b/client/src/locales/sr-Latn-RS/core.js
@@ -378,6 +378,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: 'Kloniraj karticu',
      edit: 'Izmeni',
      editColor_title: null,
--- a/client/src/locales/sv-SE/core.js
+++ b/client/src/locales/sv-SE/core.js
@@ -380,6 +380,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: 'Avvisa alla',
+      download: null,
      duplicateCard_title: null,
      edit: 'Redigera',
      editColor_title: null,
--- a/client/src/locales/tr-TR/core.js
+++ b/client/src/locales/tr-TR/core.js
@@ -378,6 +378,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: null,
      edit: 'Düzenle',
      editColor_title: null,
--- a/client/src/locales/uk-UA/core.js
+++ b/client/src/locales/uk-UA/core.js
@@ -398,6 +398,7 @@ export default {
      deleteUser_title: 'Видалити Користувача',
      deleteWebhook: 'Видалити вебхук',
      dismissAll: 'Скасувати всі',
+      download: null,
      duplicateCard_title: 'Дублювати Картку',
      edit: 'Редагувати',
      editColor_title: 'Редагувати колір',
--- a/client/src/locales/uz-UZ/core.js
+++ b/client/src/locales/uz-UZ/core.js
@@ -377,6 +377,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: null,
      edit: 'Tahrirlash',
      editColor_title: null,
--- a/client/src/locales/zh-CN/core.js
+++ b/client/src/locales/zh-CN/core.js
@@ -379,6 +379,7 @@ export default {
      deleteUser_title: '删除用户',
      deleteWebhook: '删除Webhook',
      dismissAll: '全部忽略',
+      download: null,
      duplicateCard_title: '复制卡片',
      edit: '编辑',
      editColor_title: '编辑颜色',
--- a/client/src/locales/zh-TW/core.js
+++ b/client/src/locales/zh-TW/core.js
@@ -374,6 +374,7 @@ export default {
      deleteUser_title: null,
      deleteWebhook: null,
      dismissAll: null,
+      download: null,
      duplicateCard_title: null,
      edit: '編輯',
      editColor_title: null,
--- a/client/src/models/Attachment.js
+++ b/client/src/models/Attachment.js
@@ -6,6 +6,7 @@
 import { attr, fk } from 'redux-orm';

 import BaseModel from './BaseModel';
+import getFilenameAndExtension from '../utils/get-filename-and-extension';
 import ActionTypes from '../constants/ActionTypes';
 import { AttachmentTypes } from '../constants/Enums';

@@ -14,10 +15,7 @@ const prepareAttachment = (attachment) => {
    return attachment;
  }

-  const filename = attachment.data.url.split('/').pop().toLowerCase();
-
-  let extension = filename.slice((Math.max(0, filename.lastIndexOf('.')) || Infinity) + 1);
-  extension = extension ? extension.toLowerCase() : null;
+  const { filename, extension } = getFilenameAndExtension(attachment.data.url);

  return {
    ...attachment,
--- a/client/src/utils/get-filename-and-extension.js
+++ b/client/src/utils/get-filename-and-extension.js
@@ -0,0 +1,16 @@
+/*!
+ * Copyright (c) 2024 PLANKA Software GmbH
+ * Licensed under the Fair Use License: https://github.com/plankanban/planka/blob/master/LICENSE.md
+ */
+
+export default (url) => {
+  const filename = url.split('/').pop().toLowerCase();
+
+  let extension = filename.slice((Math.max(0, filename.lastIndexOf('.')) || Infinity) + 1);
+  extension = extension ? extension.toLowerCase() : null;
+
+  return {
+    filename,
+    extension,
+  };
+};
--- a/server/api/hooks/query-methods/models/Card.js
+++ b/server/api/hooks/query-methods/models/Card.js
@@ -3,9 +3,9 @@
 * Licensed under the Fair Use License: https://github.com/plankanban/planka/blob/master/LICENSE.md
 */

-const LIMIT = 50;
+const buildSearchParts = require('../../../../utils/build-query-parts');

-const SEARCH_PARTS_REGEX = /[ ,;]+/;
+const LIMIT = 50;

 const defaultFind = (criteria, { sort = 'id', limit } = {}) =>
  Card.find(criteria).sort(sort).limit(limit);
@@ -53,13 +53,7 @@ const getIdsByEndlessListId = async (
      queryValues.push(search.substring(1));
      query += ` AND (card.name ~* $${queryValues.length} OR card.description ~* $${queryValues.length})`;
    } else {
-      const searchParts = search.split(SEARCH_PARTS_REGEX).flatMap((searchPart) => {
-        if (!searchPart) {
-          return [];
-        }
-
-        return searchPart.toLowerCase();
-      });
+      const searchParts = buildSearchParts(search);

      if (searchParts.length > 0) {
        let ilikeValues = searchParts.map((searchPart) => {
--- a/server/utils/build-query-parts.js
+++ b/server/utils/build-query-parts.js
@@ -0,0 +1,17 @@
+/*!
+ * Copyright (c) 2024 PLANKA Software GmbH
+ * Licensed under the Fair Use License: https://github.com/plankanban/planka/blob/master/LICENSE.md
+ */
+
+const QUERY_PARTS_REGEX = /[ ,;]+/;
+
+const buildQueryParts = (query) =>
+  query.split(QUERY_PARTS_REGEX).flatMap((queryPart) => {
+    if (!queryPart) {
+      return [];
+    }
+
+    return queryPart.toLowerCase();
+  });
+
+module.exports = buildQueryParts;