rework internal order system

2026-03-24 14:02:16 +01:00
parent 90944ca5f6
commit abb337c683
9 changed files with 261 additions and 75 deletions
--- a/frontend/src/components/chat/ChatMessage.tsx
+++ b/frontend/src/components/chat/ChatMessage.tsx
@@ -10,7 +10,7 @@ import type { NextcloudMessage } from '../../types/nextcloud.types';
 import FileMessageContent from './FileMessageContent';
 import RichMessageText from './RichMessageText';
 import PollMessageContent from './PollMessageContent';
-import MessageReactions from './MessageReactions';
+import { ReactionChips, AddReactionButton } from './MessageReactions';

 const SENDER_COLORS = [
  '#E53935', '#D81B60', '#8E24AA', '#5E35B1',
@@ -44,9 +44,24 @@ function hasPollParam(params?: Record<string, any>): boolean {

 const ChatMessage: React.FC<ChatMessageProps> = ({ message, isOwnMessage, isOneToOne, onReplyClick, onReactionToggled, reactionsOverride }) => {
  const [hovered, setHovered] = useState(false);
+  const hoverDelayTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
  const longPressTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
  const hideTimer = useRef<ReturnType<typeof setTimeout> | null>(null);

+  const handleMouseEnter = () => {
+    hoverDelayTimer.current = setTimeout(() => {
+      setHovered(true);
+    }, 200);
+  };
+
+  const handleMouseLeave = () => {
+    if (hoverDelayTimer.current) {
+      clearTimeout(hoverDelayTimer.current);
+      hoverDelayTimer.current = null;
+    }
+    setHovered(false);
+  };
+
  const handleTouchStart = () => {
    longPressTimer.current = setTimeout(() => {
      setHovered(true);
@@ -73,6 +88,7 @@ const ChatMessage: React.FC<ChatMessageProps> = ({ message, isOwnMessage, isOneT
    }
    setHovered(false);
  };
+
  const time = new Date(message.timestamp * 1000).toLocaleTimeString('de-DE', {
    hour: '2-digit',
    minute: '2-digit',
@@ -96,7 +112,43 @@ const ChatMessage: React.FC<ChatMessageProps> = ({ message, isOwnMessage, isOneT

  const reactions = reactionsOverride?.reactions ?? message.reactions ?? {};
  const reactionsSelf = reactionsOverride?.reactionsSelf ?? message.reactionsSelf ?? [];
-  const hasReactions = Object.keys(reactions).length > 0;
+
+  /* Vertical toolbar with reply + add-reaction */
+  const toolbar = (
+    <Box
+      sx={{
+        display: 'flex',
+        flexDirection: 'column',
+        alignItems: 'center',
+        gap: 0.25,
+        opacity: hovered ? 0.7 : 0,
+        visibility: hovered ? 'visible' : 'hidden',
+        transition: 'opacity 0.15s, visibility 0.15s',
+        alignSelf: 'center',
+        flexShrink: 0,
+      }}
+    >
+      {onReplyClick && (
+        <Tooltip title="Antworten">
+          <IconButton
+            size="small"
+            onClick={() => onReplyClick(message)}
+            sx={{ width: 24, height: 24 }}
+          >
+            <ReplyIcon sx={{ fontSize: '0.9rem', transform: isOwnMessage ? 'scaleX(-1)' : undefined }} />
+          </IconButton>
+        </Tooltip>
+      )}
+      {onReactionToggled && (
+        <AddReactionButton
+          token={message.token}
+          messageId={message.id}
+          reactionsSelf={reactionsSelf}
+          onReactionToggled={() => onReactionToggled(message.id)}
+        />
+      )}
+    </Box>
+  );

  return (
    <Box
@@ -105,27 +157,17 @@ const ChatMessage: React.FC<ChatMessageProps> = ({ message, isOwnMessage, isOneT
        justifyContent: isOwnMessage ? 'flex-end' : 'flex-start',
        my: 0.5,
        px: 1,
-        alignItems: 'flex-end',
+        alignItems: 'flex-start',
        gap: 0.5,
      }}
-      onMouseEnter={() => setHovered(true)}
-      onMouseLeave={() => setHovered(false)}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
      onTouchStart={handleTouchStart}
      onTouchEnd={handleTouchEnd}
      onTouchMove={handleTouchMove}
    >
-      {/* Reply button for own messages (shown on left) */}
-      {isOwnMessage && onReplyClick && (
-        <Tooltip title="Antworten">
-          <IconButton
-            size="small"
-            onClick={() => onReplyClick(message)}
-            sx={{ opacity: hovered ? 0.7 : 0, visibility: hovered ? 'visible' : 'hidden', transition: 'opacity 0.15s, visibility 0.15s', mb: 0.5 }}
-          >
-            <ReplyIcon sx={{ fontSize: '0.9rem', transform: 'scaleX(-1)' }} />
-          </IconButton>
-        </Tooltip>
-      )}
+      {/* Own messages: toolbar on LEFT */}
+      {isOwnMessage && toolbar}

      <Box sx={{ maxWidth: '80%' }}>
        <Paper
@@ -212,29 +254,18 @@ const ChatMessage: React.FC<ChatMessageProps> = ({ message, isOwnMessage, isOneT
          </Typography>
        </Paper>

-        {/* Reactions — always rendered to avoid layout shift */}
-        <MessageReactions
+        {/* Reaction chips below the bubble */}
+        <ReactionChips
          token={message.token}
          messageId={message.id}
          reactions={reactions}
          reactionsSelf={reactionsSelf}
          onReactionToggled={() => onReactionToggled?.(message.id)}
-          visible={hovered || hasReactions}
        />
      </Box>

-      {/* Reply button for other messages (shown on right) */}
-      {!isOwnMessage && onReplyClick && (
-        <Tooltip title="Antworten">
-          <IconButton
-            size="small"
-            onClick={() => onReplyClick(message)}
-            sx={{ opacity: hovered ? 0.7 : 0, visibility: hovered ? 'visible' : 'hidden', transition: 'opacity 0.15s, visibility 0.15s', mb: 0.5 }}
-          >
-            <ReplyIcon sx={{ fontSize: '0.9rem' }} />
-          </IconButton>
-        </Tooltip>
-      )}
+      {/* Partner messages: toolbar on RIGHT */}
+      {!isOwnMessage && toolbar}
    </Box>
  );
 };
--- a/frontend/src/components/chat/MessageReactions.tsx
+++ b/frontend/src/components/chat/MessageReactions.tsx
@@ -34,24 +34,16 @@ const EXTENDED_EMOJI_CATEGORIES: { label: string; emojis: string[] }[] = [
  },
 ];

-interface MessageReactionsProps {
-  token: string;
-  messageId: number;
-  reactions: Record<string, number>;
-  reactionsSelf: string[];
-  onReactionToggled: () => void;
-  visible?: boolean;
-}
+/* ------------------------------------------------------------------ */
+/*  Shared toggle helper                                               */
+/* ------------------------------------------------------------------ */

-const MessageReactions: React.FC<MessageReactionsProps> = ({
-  token,
-  messageId,
-  reactions,
-  reactionsSelf,
-  onReactionToggled,
-  visible = true,
-}) => {
-  const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
+function useReactionToggle(
+  token: string,
+  messageId: number,
+  reactionsSelf: string[],
+  onReactionToggled: () => void,
+) {
  const [loading, setLoading] = useState<string | null>(null);

  const handleToggle = async (emoji: string) => {
@@ -70,8 +62,33 @@ const MessageReactions: React.FC<MessageReactionsProps> = ({
    }
  };

+  return { loading, handleToggle };
+}
+
+/* ------------------------------------------------------------------ */
+/*  ReactionChips — existing reactions rendered below the bubble        */
+/* ------------------------------------------------------------------ */
+
+interface ReactionChipsProps {
+  token: string;
+  messageId: number;
+  reactions: Record<string, number>;
+  reactionsSelf: string[];
+  onReactionToggled: () => void;
+}
+
+const ReactionChips: React.FC<ReactionChipsProps> = ({
+  token,
+  messageId,
+  reactions,
+  reactionsSelf,
+  onReactionToggled,
+}) => {
+  const { loading, handleToggle } = useReactionToggle(token, messageId, reactionsSelf, onReactionToggled);
  const hasReactions = Object.keys(reactions).length > 0;

+  if (!hasReactions) return null;
+
  return (
    <Box sx={{
      display: 'flex',
@@ -79,12 +96,8 @@ const MessageReactions: React.FC<MessageReactionsProps> = ({
      gap: 0.25,
      mt: 0.25,
      alignItems: 'center',
-      minHeight: 24,
-      visibility: visible ? 'visible' : 'hidden',
-      opacity: visible ? 1 : 0,
-      transition: 'opacity 0.15s, visibility 0.15s',
    }}>
-      {hasReactions && Object.entries(reactions).map(([emoji, count]) => (
+      {Object.entries(reactions).map(([emoji, count]) => (
        <Chip
          key={emoji}
          label={`${emoji} ${count}`}
@@ -102,11 +115,37 @@ const MessageReactions: React.FC<MessageReactionsProps> = ({
          }}
        />
      ))}
+    </Box>
+  );
+};
+
+/* ------------------------------------------------------------------ */
+/*  AddReactionButton — icon button + emoji popover                    */
+/* ------------------------------------------------------------------ */
+
+interface AddReactionButtonProps {
+  token: string;
+  messageId: number;
+  reactionsSelf: string[];
+  onReactionToggled: () => void;
+}
+
+const AddReactionButton: React.FC<AddReactionButtonProps> = ({
+  token,
+  messageId,
+  reactionsSelf,
+  onReactionToggled,
+}) => {
+  const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
+  const { handleToggle } = useReactionToggle(token, messageId, reactionsSelf, onReactionToggled);
+
+  return (
+    <>
      <Tooltip title="Reaktion hinzuf\u00FCgen">
        <IconButton
          size="small"
          onClick={(e) => setAnchorEl(e.currentTarget)}
-          sx={{ width: 20, height: 20, opacity: 0.6, '&:hover': { opacity: 1 } }}
+          sx={{ width: 24, height: 24, opacity: 0.6, '&:hover': { opacity: 1 } }}
        >
          <AddReactionOutlinedIcon sx={{ fontSize: '0.85rem' }} />
        </IconButton>
@@ -157,8 +196,50 @@ const MessageReactions: React.FC<MessageReactionsProps> = ({
          </Box>
        </Box>
      </Popover>
+    </>
+  );
+};
+
+/* ------------------------------------------------------------------ */
+/*  Legacy default export — kept for backward compatibility            */
+/*  (combines chips + add button, same interface as before)            */
+/* ------------------------------------------------------------------ */
+
+interface MessageReactionsProps {
+  token: string;
+  messageId: number;
+  reactions: Record<string, number>;
+  reactionsSelf: string[];
+  onReactionToggled: () => void;
+  visible?: boolean;
+}
+
+const MessageReactions: React.FC<MessageReactionsProps> = (props) => {
+  const { visible = true, ...rest } = props;
+  const hasReactions = Object.keys(rest.reactions).length > 0;
+
+  return (
+    <Box sx={{
+      display: 'flex',
+      flexWrap: 'wrap',
+      gap: 0.25,
+      mt: 0.25,
+      alignItems: 'center',
+      minHeight: hasReactions ? 24 : 0,
+      visibility: visible ? 'visible' : 'hidden',
+      opacity: visible ? 1 : 0,
+      transition: 'opacity 0.15s, visibility 0.15s',
+    }}>
+      <ReactionChips {...rest} />
+      <AddReactionButton
+        token={rest.token}
+        messageId={rest.messageId}
+        reactionsSelf={rest.reactionsSelf}
+        onReactionToggled={rest.onReactionToggled}
+      />
    </Box>
  );
 };

+export { ReactionChips, AddReactionButton };
 export default MessageReactions;
--- a/frontend/src/pages/Ausruestungsanfrage.tsx
+++ b/frontend/src/pages/Ausruestungsanfrage.tsx
@@ -529,10 +529,14 @@ function DetailModal({ requestId, onClose, showAdminActions, showEditButton, can
            <>
              {/* Meta info */}
              <Box sx={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 1.5 }}>
-                {anfrage!.anfrager_name && (
+                {(anfrage!.anfrager_name || anfrage!.fuer_benutzer_name) && (
                  <Box>
                    <Typography variant="caption" color="text.secondary">Anfrage für</Typography>
-                    <Typography variant="body2" fontWeight={500}>{anfrage!.anfrager_name}</Typography>
+                    <Typography variant="body2" fontWeight={500}>
+                      {anfrage!.fuer_benutzer_name
+                        ? `${anfrage!.fuer_benutzer_name} (erstellt von ${anfrage!.anfrager_name || 'Unbekannt'})`
+                        : anfrage!.anfrager_name}
+                    </Typography>
                  </Box>
                )}
                <Box>
@@ -987,7 +991,7 @@ function MeineAnfragenTab() {
  const [createDialogOpen, setCreateDialogOpen] = useState(false);
  const [newBezeichnung, setNewBezeichnung] = useState('');
  const [newNotizen, setNewNotizen] = useState('');
-  const [newFuerBenutzer, setNewFuerBenutzer] = useState<{ id: string; name: string } | null>(null);
+  const [newFuerBenutzer, setNewFuerBenutzer] = useState<{ id: string; name: string } | string | null>(null);
  const [newItems, setNewItems] = useState<AusruestungAnfrageFormItem[]>([{ bezeichnung: '', menge: 1 }]);
  // Track loaded eigenschaften per item row (by artikel_id)
  const [itemEigenschaften, setItemEigenschaften] = useState<Record<number, AusruestungEigenschaft[]>>({});
@@ -1016,8 +1020,8 @@ function MeineAnfragenTab() {
  });

  const createMut = useMutation({
-    mutationFn: (args: { items: AusruestungAnfrageFormItem[]; notizen?: string; bezeichnung?: string; fuer_benutzer_id?: string }) =>
-      ausruestungsanfrageApi.createRequest(args.items, args.notizen, args.bezeichnung, args.fuer_benutzer_id),
+    mutationFn: (args: { items: AusruestungAnfrageFormItem[]; notizen?: string; bezeichnung?: string; fuer_benutzer_id?: string; fuer_benutzer_name?: string }) =>
+      ausruestungsanfrageApi.createRequest(args.items, args.notizen, args.bezeichnung, args.fuer_benutzer_id, args.fuer_benutzer_name),
    onSuccess: () => {
      queryClient.invalidateQueries({ queryKey: ['ausruestungsanfrage'] });
      showSuccess('Anfrage erstellt');
@@ -1085,7 +1089,8 @@ function MeineAnfragenTab() {
      items: allItems,
      notizen: newNotizen || undefined,
      bezeichnung: newBezeichnung || undefined,
-      fuer_benutzer_id: newFuerBenutzer?.id,
+      fuer_benutzer_id: typeof newFuerBenutzer === 'object' && newFuerBenutzer ? newFuerBenutzer.id : undefined,
+      fuer_benutzer_name: typeof newFuerBenutzer === 'string' ? newFuerBenutzer : undefined,
    });
  };

@@ -1181,11 +1186,27 @@ function MeineAnfragenTab() {
          />
          {canOrderForUser && (
            <Autocomplete
+              freeSolo
              options={orderUsers}
-              getOptionLabel={o => o.name}
+              getOptionLabel={o => typeof o === 'string' ? o : o.name}
              value={newFuerBenutzer}
              onChange={(_, v) => setNewFuerBenutzer(v)}
-              renderInput={params => <TextField {...params} label="Für wen (optional)" InputLabelProps={{ ...params.InputLabelProps, shrink: true }} placeholder="Mitglied auswählen..." />}
+              onInputChange={(_, value, reason) => {
+                if (reason === 'input') {
+                  // If user types a custom value that doesn't match any option, store as string
+                  const match = orderUsers.find(u => u.name === value);
+                  if (!match && value) {
+                    setNewFuerBenutzer(value);
+                  } else if (!value) {
+                    setNewFuerBenutzer(null);
+                  }
+                }
+              }}
+              isOptionEqualToValue={(option, value) => {
+                if (typeof option === 'string' || typeof value === 'string') return option === value;
+                return option.id === value.id;
+              }}
+              renderInput={params => <TextField {...params} label="Für wen (optional)" InputLabelProps={{ ...params.InputLabelProps, shrink: true }} placeholder="Mitglied auswählen oder Name eingeben..." />}
            />
          )}
          <TextField
@@ -1391,7 +1412,7 @@ function AlleAnfragenTab() {
                <TableRow key={r.id} hover sx={{ cursor: 'pointer' }} onClick={() => setDetailId(r.id)}>
                  <TableCell>{formatOrderId(r)}</TableCell>
                  <TableCell>{r.bezeichnung || '-'}</TableCell>
-                  <TableCell>{r.anfrager_name || r.anfrager_id}</TableCell>
+                  <TableCell>{r.fuer_benutzer_name || r.anfrager_name || r.anfrager_id}</TableCell>
                  <TableCell><Chip label={AUSRUESTUNG_STATUS_LABELS[r.status]} color={AUSRUESTUNG_STATUS_COLORS[r.status]} size="small" /></TableCell>
                  <TableCell>{r.positionen_count ?? r.items_count ?? '-'}</TableCell>
                  <TableCell>
--- a/frontend/src/services/ausruestungsanfrage.ts
+++ b/frontend/src/services/ausruestungsanfrage.ts
@@ -94,8 +94,9 @@ export const ausruestungsanfrageApi = {
    notizen?: string,
    bezeichnung?: string,
    fuer_benutzer_id?: string,
+    fuer_benutzer_name?: string,
  ): Promise<AusruestungAnfrageDetailResponse> => {
-    const r = await api.post('/api/ausruestungsanfragen/requests', { items, notizen, bezeichnung, fuer_benutzer_id });
+    const r = await api.post('/api/ausruestungsanfragen/requests', { items, notizen, bezeichnung, fuer_benutzer_id, fuer_benutzer_name });
    return r.data.data;
  },
  updateRequest: async (
@@ -140,7 +141,7 @@ export const ausruestungsanfrageApi = {

  // ── Users ──
  getOrderUsers: async (): Promise<Array<{ id: string; name: string }>> => {
-    const r = await api.get('/api/permissions/users-with', { params: { permission: 'ausruestungsanfrage:create_request' } });
+    const r = await api.get('/api/ausruestungsanfragen/users');
    return r.data.data;
  },
 };
--- a/frontend/src/types/ausruestungsanfrage.types.ts
+++ b/frontend/src/types/ausruestungsanfrage.types.ts
@@ -79,6 +79,7 @@ export interface AusruestungAnfrage {
  id: number;
  anfrager_id: string;
  anfrager_name?: string;
+  fuer_benutzer_name?: string;
  bezeichnung?: string;
  status: AusruestungAnfrageStatus;
  notizen?: string;