ref: Refactoring

client/src/components/activities/BoardActivitiesModal/Item.jsx

@@ -11,8 +11,8 @@ import { Link } from 'react-router-dom';
 import { Comment } from 'semantic-ui-react';
 
 import selectors from '../../../selectors';
+import { isUserStatic } from '../../../utils/record-helpers';
 import Paths from '../../../constants/Paths';
-import { StaticUserIds } from '../../../constants/StaticUsers';
 import { ActivityTypes } from '../../../constants/Enums';
 import TimeAgo from '../../common/TimeAgo';
 import UserAvatar from '../../users/UserAvatar';
@@ -30,12 +30,11 @@ const Item = React.memo(({ id }) => {
 
   const [t] = useTranslation();
 
-  const userName =
-    user.id === StaticUserIds.DELETED
-      ? t(`common.${user.name}`, {
-          context: 'title',
-        })
-      : user.name;
+  const userName = isUserStatic(user)
+    ? t(`common.${user.name}`, {
+        context: 'title',
+      })
+    : user.name;
 
   const cardName = card ? card.name : activity.data.card.name;
 

client/src/components/activities/CardActivities/Item.jsx

@@ -10,7 +10,7 @@ import { useTranslation, Trans } from 'react-i18next';
 import { Comment } from 'semantic-ui-react';
 
 import selectors from '../../../selectors';
-import { StaticUserIds } from '../../../constants/StaticUsers';
+import { isUserStatic } from '../../../utils/record-helpers';
 import { ActivityTypes } from '../../../constants/Enums';
 import TimeAgo from '../../common/TimeAgo';
 import UserAvatar from '../../users/UserAvatar';
@@ -26,12 +26,11 @@ const Item = React.memo(({ id }) => {
 
   const [t] = useTranslation();
 
-  const userName =
-    user.id === StaticUserIds.DELETED
-      ? t(`common.${user.name}`, {
-          context: 'title',
-        })
-      : user.name;
+  const userName = isUserStatic(user)
+    ? t(`common.${user.name}`, {
+        context: 'title',
+      })
+    : user.name;
 
   let contentNode;
   switch (activity.type) {

client/src/components/boards/Board/FiniteContent.jsx

@@ -15,13 +15,13 @@ import ListView from './ListView';
 const FiniteContent = React.memo(() => {
   const board = useSelector(selectors.selectCurrentBoard);
   const cardIds = useSelector(selectors.selectFilteredCardIdsForCurrentBoard);
-  const hasAnyFiniteList = useSelector((state) => !!selectors.selectFirstFiniteListId(state));
+  const canAddCard = useSelector((state) => !!selectors.selectFirstKanbanListId(state));
 
   const dispatch = useDispatch();
 
   const handleCardCreate = useCallback(
     (data, autoOpen) => {
-      dispatch(entryActions.createCardInFirstFiniteList(data, undefined, autoOpen));
+      dispatch(entryActions.createCardInCurrentContext(data, undefined, autoOpen));
     },
     [dispatch],
   );
@@ -39,7 +39,7 @@ const FiniteContent = React.memo(() => {
     default:
   }
 
-  return <View cardIds={cardIds} onCardCreate={hasAnyFiniteList ? handleCardCreate : undefined} />;
+  return <View cardIds={cardIds} onCardCreate={canAddCard ? handleCardCreate : undefined} />;
 });
 
 export default FiniteContent;

client/src/components/boards/Board/KanbanContent/KanbanContent.jsx

@@ -23,7 +23,7 @@ import styles from './KanbanContent.module.scss';
 import globalStyles from '../../../../styles.module.scss';
 
 const KanbanContent = React.memo(() => {
-  const listIds = useSelector(selectors.selectFiniteListIdsForCurrentBoard);
+  const listIds = useSelector(selectors.selectKanbanListIdsForCurrentBoard);
 
   const canAddList = useSelector((state) => {
     const isEditModeEnabled = selectors.selectIsEditModeEnabled(state); // TODO: move out?

client/src/components/cards/Card/Card.module.scss

@@ -21,6 +21,7 @@
     top: 2px;
     transition: background 85ms ease;
     width: 20px;
+    z-index: 1000;
 
     &:hover {
       background: #ebeef0;
@@ -52,6 +53,7 @@
     background: #fff;
     border-radius: 3px;
     box-shadow: 0 1px 0 #ccc;
+    overflow: hidden;
     position: relative;
 
     &:hover {

client/src/components/cards/CardModal/CreationDetailsStep.jsx

@@ -10,7 +10,7 @@ import { useTranslation } from 'react-i18next';
 import { Icon } from 'semantic-ui-react';
 
 import selectors from '../../../selectors';
-import { StaticUserIds } from '../../../constants/StaticUsers';
+import { isUserStatic } from '../../../utils/record-helpers';
 import TimeAgo from '../../common/TimeAgo';
 import UserAvatar from '../../users/UserAvatar';
 
@@ -32,7 +32,7 @@ const CreationDetailsStep = React.memo(({ userId }) => {
         </span>
         <span className={styles.content}>
           <div className={styles.name}>
-            {user.id === StaticUserIds.DELETED
+            {isUserStatic(user)
               ? t(`common.${user.name}`, {
                   context: 'title',
                 })

client/src/components/cards/CardModal/StoryContent.jsx

@@ -9,32 +9,32 @@ import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { Gallery, Item as GalleryItem } from 'react-photoswipe-gallery';
 import { Button, Grid, Icon } from 'semantic-ui-react';
-import { useDidUpdate } from '../../../../lib/hooks';
+import { useDidUpdate } from '../../../lib/hooks';
 
-import selectors from '../../../../selectors';
-import entryActions from '../../../../entry-actions';
-import { usePopupInClosableContext } from '../../../../hooks';
-import { isUsableMarkdownElement } from '../../../../utils/element-helpers';
-import { BoardMembershipRoles, CardTypes, ListTypes } from '../../../../constants/Enums';
-import { CardTypeIcons } from '../../../../constants/Icons';
-import { ClosableContext } from '../../../../contexts';
+import selectors from '../../../selectors';
+import entryActions from '../../../entry-actions';
+import { usePopupInClosableContext } from '../../../hooks';
+import { isUsableMarkdownElement } from '../../../utils/element-helpers';
+import { BoardMembershipRoles, CardTypes, ListTypes } from '../../../constants/Enums';
+import { CardTypeIcons } from '../../../constants/Icons';
+import { ClosableContext } from '../../../contexts';
+import NameField from './NameField';
 import Thumbnail from './Thumbnail';
-import NameField from '../NameField';
-import CustomFieldGroups from '../CustomFieldGroups';
-import Communication from '../Communication';
-import CreationDetailsStep from '../CreationDetailsStep';
-import MoreActionsStep from '../MoreActionsStep';
-import Markdown from '../../../common/Markdown';
-import EditMarkdown from '../../../common/EditMarkdown';
-import ConfirmationStep from '../../../common/ConfirmationStep';
-import UserAvatar from '../../../users/UserAvatar';
-import BoardMembershipsStep from '../../../board-memberships/BoardMembershipsStep';
-import LabelChip from '../../../labels/LabelChip';
-import LabelsStep from '../../../labels/LabelsStep';
-import ListsStep from '../../../lists/ListsStep';
-import Attachments from '../../../attachments/Attachments';
-import AddAttachmentStep from '../../../attachments/AddAttachmentStep';
-import AddCustomFieldGroupStep from '../../../custom-field-groups/AddCustomFieldGroupStep';
+import CustomFieldGroups from './CustomFieldGroups';
+import Communication from './Communication';
+import CreationDetailsStep from './CreationDetailsStep';
+import MoreActionsStep from './MoreActionsStep';
+import Markdown from '../../common/Markdown';
+import EditMarkdown from '../../common/EditMarkdown';
+import ConfirmationStep from '../../common/ConfirmationStep';
+import UserAvatar from '../../users/UserAvatar';
+import BoardMembershipsStep from '../../board-memberships/BoardMembershipsStep';
+import LabelChip from '../../labels/LabelChip';
+import LabelsStep from '../../labels/LabelsStep';
+import ListsStep from '../../lists/ListsStep';
+import Attachments from '../../attachments/Attachments';
+import AddAttachmentStep from '../../attachments/AddAttachmentStep';
+import AddCustomFieldGroupStep from '../../custom-field-groups/AddCustomFieldGroupStep';
 
 import styles from './StoryContent.module.scss';
 

client/src/components/cards/CardModal/StoryContent.module.scss

@@ -99,7 +99,7 @@
   }
 
   .coverWrapper {
-    padding-bottom: 20px;
+    padding-bottom: 10px;
   }
 
   .cursorPointer {
@@ -283,7 +283,7 @@
   }
 
   .moduleWrapperAttachments {
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
 
   .moreActionsButton {

client/src/components/cards/CardModal/StoryContent/index.js

@@ -1,8 +0,0 @@
-/*!
- * Copyright (c) 2024 PLANKA Software GmbH
- * Licensed under the Fair Use License: https://github.com/plankanban/planka/blob/master/LICENSE.md
- */
-
-import StoryContent from './StoryContent';
-
-export default StoryContent;

client/src/components/cards/CardModal/Thumbnail.jsx

@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 import { Item as GalleryItem } from 'react-photoswipe-gallery';
 
-import selectors from '../../../../selectors';
+import selectors from '../../../selectors';
 
 import styles from './Thumbnail.module.scss';
 

client/src/components/comments/Comments/Item.jsx

@@ -14,8 +14,7 @@ import { useDidUpdate } from '../../../lib/hooks';
 import selectors from '../../../selectors';
 import entryActions from '../../../entry-actions';
 import { usePopupInClosableContext } from '../../../hooks';
-import { isListArchiveOrTrash } from '../../../utils/record-helpers';
-import { StaticUserIds } from '../../../constants/StaticUsers';
+import { isListArchiveOrTrash, isUserStatic } from '../../../utils/record-helpers';
 import { BoardMembershipRoles } from '../../../constants/Enums';
 import { ClosableContext } from '../../../contexts';
 import Edit from './Edit';
@@ -107,7 +106,7 @@ const Item = React.memo(({ id }) => {
         ) : (
           <div className={classNames(styles.bubble, isCurrentUser && styles.bubbleRight)}>
             <div className={styles.header}>
-              {user.id === StaticUserIds.DELETED
+              {isUserStatic(user)
                 ? t(`common.${user.name}`, {
                     context: 'title',
                   })

client/src/components/common/AdministrationModal/UsersPane/UsersPane.jsx

@@ -17,9 +17,9 @@ import AddStep from './AddStep';
 import styles from './UsersPane.module.scss';
 
 const UsersPane = React.memo(() => {
+  const activeUsersTotal = useSelector(selectors.selectActiveUsersTotal);
   const activeUsersLimit = useSelector(selectors.selectActiveUsersLimit);
   const users = useSelector(selectors.selectUsers);
-  const activeUsersTotal = useSelector(selectors.selectActiveUsersTotal);
 
   const canAdd = useSelector((state) => {
     const oidcBootstrap = selectors.selectOidcBootstrap(state);

client/src/components/common/Linkify/Link.jsx

@@ -12,7 +12,7 @@ import selectors from '../../../selectors';
 import matchPaths from '../../../utils/match-paths';
 import Paths from '../../../constants/Paths';
 
-const Linkify = React.memo(({ href, content, stopPropagation, ...props }) => {
+const Link = React.memo(({ href, content, stopPropagation, ...props }) => {
   const selectCardById = useMemo(() => selectors.makeSelectCardById(), []);
 
   const url = useMemo(() => {
@@ -68,14 +68,14 @@ const Linkify = React.memo(({ href, content, stopPropagation, ...props }) => {
   );
 });
 
-Linkify.propTypes = {
+Link.propTypes = {
   href: PropTypes.string.isRequired,
   content: PropTypes.string.isRequired,
   stopPropagation: PropTypes.bool,
 };
 
-Linkify.defaultProps = {
+Link.defaultProps = {
   stopPropagation: false,
 };
 
-export default Linkify;
+export default Link;

client/src/components/notifications/NotificationsStep/Item.jsx

@@ -14,8 +14,8 @@ import { Button } from 'semantic-ui-react';
 import selectors from '../../../selectors';
 import entryActions from '../../../entry-actions';
 import { mentionMarkupToText } from '../../../utils/mentions';
+import { isUserStatic } from '../../../utils/record-helpers';
 import Paths from '../../../constants/Paths';
-import { StaticUserIds } from '../../../constants/StaticUsers';
 import { NotificationTypes } from '../../../constants/Enums';
 import TimeAgo from '../../common/TimeAgo';
 import UserAvatar from '../../users/UserAvatar';
@@ -42,12 +42,11 @@ const Item = React.memo(({ id, onClose }) => {
     dispatch(entryActions.deleteNotification(id));
   }, [id, dispatch]);
 
-  const creatorUserName =
-    creatorUser.id === StaticUserIds.DELETED
-      ? t(`common.${creatorUser.name}`, {
-          context: 'title',
-        })
-      : creatorUser.name;
+  const creatorUserName = isUserStatic(creatorUser)
+    ? t(`common.${creatorUser.name}`, {
+        context: 'title',
+      })
+    : creatorUser.name;
 
   const cardName = card ? card.name : notification.data.card.name;
 

client/src/components/users/UserAvatar/UserAvatar.jsx

@@ -13,7 +13,7 @@ import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 
 import selectors from '../../../selectors';
-import { StaticUserIds } from '../../../constants/StaticUsers';
+import { isUserStatic } from '../../../utils/record-helpers';
 
 import styles from './UserAvatar.module.scss';
 
@@ -62,7 +62,7 @@ const UserAvatar = React.memo(
     const contentNode = (
       <span
         title={
-          user.id === StaticUserIds.DELETED
+          isUserStatic(user)
             ? t(`common.${user.name}`, {
                 context: 'title',
               })