M2-6109: [FE] [Web App] Header - Update to Include Subject and Respondent

src/abstract/lib/types/multiInformant.ts

@@ -1,4 +1,10 @@
+export type MultiInformantSubject = {
+  id: string;
+  secretId: string | null;
+  nickname: string | null;
+};
+
 export type MultiInformantState = {
-  sourceSubjectId?: string;
-  targetSubjectId?: string;
+  sourceSubject?: MultiInformantSubject;
+  targetSubject?: MultiInformantSubject;
 };

src/entities/applet/model/hooks/useMultiInformantState.ts

@@ -21,7 +21,7 @@ export const useMultiInformantState = (): Return => {
   const getMultiInformantState = useCallback(() => multiInformantState, [multiInformantState]);
 
   const isInMultiInformantFlow = useCallback(() => {
-    return !!multiInformantState.sourceSubjectId && !!multiInformantState.targetSubjectId;
+    return !!multiInformantState.sourceSubject?.id && !!multiInformantState.targetSubject?.id;
   }, [multiInformantState]);
 
   const initiateTakeNow = useCallback(

src/entities/applet/model/types.ts

@@ -1,4 +1,5 @@
 import { GroupProgress } from '~/abstract/lib';
+import { MultiInformantState } from '~/abstract/lib/types/multiInformant';
 import {
   Answer,
   AudioPlayerItem,
@@ -174,7 +175,4 @@ export type InProgressFlow = {
   pipelineActivityOrder: number;
 };
 
-export type MultiInformantPayload = {
-  sourceSubjectId: string;
-  targetSubjectId: string;
-};
+export type MultiInformantPayload = Required<MultiInformantState>;

src/features/TakeNow/lib/useTakeNowValidation.tsx

@@ -121,6 +121,9 @@ export const useTakeNowValidation = ({
     return errorState(t('takeNow.invalidSubject'));
   }
 
+  const { nickname: targetSubjectNickname, secretUserId: targetSecretUserId } =
+    subjectData.data.result;
+
   if (isActivityError) {
     return errorState(t('takeNow.invalidActivity'));
   }
@@ -161,15 +164,27 @@ export const useTakeNowValidation = ({
     return errorState(null);
   }
 
-  const { subjectId: sourceSubjectId } = respondentData.data.result;
+  const {
+    subjectId: sourceSubjectId,
+    nickname: sourceSubjectNickname,
+    secretUserId: sourceSecretUserId,
+  } = respondentData.data.result;
 
   return {
     isLoading: false,
     isError: false,
     isSuccess: true,
     data: {
-      sourceSubjectId,
-      targetSubjectId,
+      sourceSubject: {
+        id: sourceSubjectId,
+        nickname: sourceSubjectNickname,
+        secretId: sourceSecretUserId,
+      },
+      targetSubject: {
+        id: targetSubjectId,
+        nickname: targetSubjectNickname,
+        secretId: targetSecretUserId,
+      },
     },
   };
 };

src/features/TakeNow/ui/MultiInformantBadge.tsx

@@ -0,0 +1,36 @@
+import { useMultiInformantState } from '~/entities/applet/model/hooks';
+import { MultiInformantBadgeTile } from '~/features/TakeNow/ui/MultiInformantBadgeTile';
+import { Theme } from '~/shared/constants';
+import { Box } from '~/shared/ui';
+import { useLaunchDarkly } from '~/shared/utils/hooks/useLaunchDarkly';
+
+export const MultiInformantBadge = () => {
+  const { getMultiInformantState, isInMultiInformantFlow } = useMultiInformantState();
+  const { flags: featureFlags } = useLaunchDarkly();
+
+  if (!isInMultiInformantFlow() || !featureFlags.enableMultiInformant) {
+    return null;
+  }
+
+  const { sourceSubject, targetSubject } = getMultiInformantState();
+
+  if (!sourceSubject || !targetSubject) {
+    return null;
+  }
+
+  return (
+    <Box
+      display="flex"
+      padding="4px"
+      alignItems="center"
+      gap="4px"
+      width="192px"
+      height="40px"
+      borderRadius="8px"
+      border={`1px solid ${Theme.colors.light.surfaceVariant}`}
+    >
+      <MultiInformantBadgeTile type="Respondent" subject={sourceSubject} />
+      <MultiInformantBadgeTile type="Subject" subject={targetSubject} />
+    </Box>
+  );
+};

src/features/TakeNow/ui/MultiInformantBadgeTile.tsx

@@ -0,0 +1,55 @@
+import Tooltip from '@mui/material/Tooltip';
+
+import { MultiInformantSubject } from '~/abstract/lib/types/multiInformant';
+import { Theme } from '~/shared/constants';
+import { Box } from '~/shared/ui';
+
+type MultiInformantBadgeTileProps = {
+  type: 'Subject' | 'Respondent';
+  subject: MultiInformantSubject;
+};
+
+export const MultiInformantBadgeTile = ({ subject, type }: MultiInformantBadgeTileProps) => {
+  const { id, secretId, nickname } = subject;
+  let text = secretId ?? id;
+  if (nickname) {
+    text += `, ${nickname}`;
+  }
+
+  const tooltipText = `${type}: ${text}`;
+
+  const backgroundColor = type === 'Subject' ? Theme.colors.light.inverseOnSurface : 'transparent';
+
+  return (
+    <Box
+      display="flex"
+      padding="8px"
+      alignItems="center"
+      gap="8px"
+      flex="1 0 0"
+      borderRadius="4px"
+      width="78px"
+      height="100%"
+      sx={{ backgroundColor, cursor: 'default' }}
+    >
+      <Tooltip title={tooltipText}>
+        <p
+          style={{
+            overflow: 'hidden',
+            color: Theme.colors.light.onSurface,
+            textOverflow: 'ellipsis',
+
+            fontSize: '16px',
+            fontStyle: 'normal',
+            fontWeight: 400,
+            lineHeight: '24px',
+            letterSpacing: '0.5px',
+            whiteSpace: 'nowrap',
+          }}
+        >
+          {text}
+        </p>
+      </Tooltip>
+    </Box>
+  );
+};

src/features/TakeNow/ui/ValidateTakeNowParams.tsx

@@ -26,18 +26,18 @@
 
   useEffect(() => {
     if (isSuccess && data) {
-      const { sourceSubjectId, targetSubjectId } = data;
+      const { sourceSubject, targetSubject } = data;
 
       const multiInformantState = getMultiInformantState();
       if (
         !isInMultiInformantFlow() ||
-        sourceSubjectId !== multiInformantState.sourceSubjectId ||
-        targetSubjectId !== multiInformantState.targetSubjectId
+        sourceSubject.id !== multiInformantState.sourceSubject?.id ||
+        targetSubject.id !== multiInformantState.targetSubject?.id
       ) {
-        initiateTakeNow({ sourceSubjectId, targetSubjectId });
+        initiateTakeNow({ sourceSubject, targetSubject });
       }
     }
   }, [data, initiateTakeNow, isInMultiInformantFlow, isSuccess]);
 
   useEffect(() => {
     if (error) {

src/features/TakeNow/ui/index.ts

@@ -1 +1,3 @@
 export * from './ValidateTakeNowParams';
+export * from './MultiInformantBadge';
+export * from './MultiInformantBadgeTile';

src/widgets/ActivityDetails/model/hooks/useAnswers.ts

@@ -142,8 +142,8 @@
       if (featureFlags.enableMultiInformant) {
         const multiInformantState = getMultiInformantState();
         if (isInMultiInformantFlow()) {
-          answer.sourceSubjectId = multiInformantState.sourceSubjectId;
-          answer.targetSubjectId = multiInformantState.targetSubjectId;
+          answer.sourceSubjectId = multiInformantState.sourceSubject?.id;
+          answer.targetSubjectId = multiInformantState.targetSubject?.id;
         }
       }
 
@@ -154,7 +154,7 @@
 
       return answer;
     },
     [
       encryptPayload,
       generateUserPrivateKey,
       getGroupProgress,

src/widgets/ActivityDetails/ui/AssessmentLayoutHeader.tsx

@@ -1,7 +1,7 @@
 import { SaveAndExitButton } from '~/features/SaveAssessmentAndExit';
+import { MultiInformantBadge } from '~/features/TakeNow';
 import { ROUTES, Theme } from '~/shared/constants';
-import { Box } from '~/shared/ui';
-import { BaseProgressBar, Text } from '~/shared/ui';
+import { BaseProgressBar, Box, Text } from '~/shared/ui';
 import { useCustomMediaQuery, useCustomNavigation } from '~/shared/utils';
 
 type Props = {
@@ -40,12 +40,15 @@ export const AssessmentLayoutHeader = (props: Props) => {
       justifyContent="center"
       gridTemplateColumns="1fr minmax(300px, 900px) 1fr"
       padding={greaterThanSM ? '19px 24px' : '15px 16px'}
+      height={87}
       gap={1.5}
       sx={{
         backgroundColor: Theme.colors.light.surface,
         borderBottom: `1px solid ${Theme.colors.light.surfaceVariant}`,
       }}
     >
+      <MultiInformantBadge />
+
       <Box sx={{ gridColumn: '2 / 3' }}>
         <Box
           display="flex"