Merge pull request #2232 from release/2026.06.2

Release 2026.06.2

Author: divbzero

.github/codeql/codeql-config.yml

@@ -0,0 +1,20 @@
+name: "Custom CodeQL Config"
+
+# Specify which queries to run
+queries:
+  - uses: security-extended
+  - uses: security-and-quality
+
+# Paths to exclude from analysis
+paths-ignore:
+  - node_modules
+  - dist
+  - build
+  - coverage
+  - '**/*.test.tsx'
+  - '**/*.test.ts'
+
+
+# Paths to include in analysis
+paths:
+  - src

.github/dependabot.yml

@@ -1,5 +1,14 @@
 version: 2
 updates:
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "[GHA] Dependabot:"
+      prefix-development: "[GHA-dev] Dependabot:"
+    pull-request-branch-name:
+      separator: "-"
   - package-ecosystem: 'npm'
     directory: '/'
     schedule:

.github/workflows/codeql.yml

@@ -0,0 +1,50 @@
+# .github/workflows/codeql.yml
+name: "CodeQL"
+
+on:
+  workflow_dispatch: {}
+  push:
+    branches: [ "main", "develop" ]
+  pull_request:
+    branches: [ "develop" ]
+    types: [opened, synchronize, reopened]
+#  schedule:
+#    # Run at 2:30 AM UTC every day
+#    - cron: '30 2 * * *'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports: 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift'
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v4
+      with:
+        languages: ${{ matrix.language }}
+        config-file: ./.github/codeql/codeql-config.yml
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v4
+      with:
+        category: "/language:${{matrix.language}}"

README.md

@@ -2,7 +2,7 @@
 
 This repository is used for the A* `yarn eject`
 
-    **Note: this is a one-way operation. Once you `eject`, you can't go back!**n Panel of the [Curious](https://mindlogger.org/) application stack.
+    **Note: this is a one-way operation. Once you `eject`, you can't go back!**n Panel of the [Curious](https://gettingcurious.com/) application stack.
 
 ## Getting Started
 

src/modules/Auth/features/SignUp/SignUpForm/SignUpForm.tsx

@@ -128,7 +128,7 @@ export const SignUpForm = () => {
           label={
             <StyledLabel>
               {t('agreement')}
-              <StyledLink href="https://mindlogger.org/terms" target="_blank">
+              <StyledLink href="https://www.gettingcurious.com/terms" target="_blank">
                 {t('termsOfService')}
               </StyledLink>
             </StyledLabel>

src/modules/Dashboard/components/ActivityAssignDrawer/ActivityAssignDrawer.tsx

@@ -1,6 +1,7 @@
 import { useTranslation } from 'react-i18next';
 import { Box, Button, Drawer, Fade, IconButton } from '@mui/material';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import unionBy from 'lodash/unionBy';
 import { Controller, SubmitHandler, useForm, useWatch } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 
@@ -32,7 +33,11 @@ import {
 } from 'api';
 import { hydrateActivityFlows } from 'modules/Dashboard/utils';
 import { Activity } from 'redux/modules';
-import { AssignmentCounts, useParticipantDropdown } from 'modules/Dashboard/components';
+import {
+  AssignmentCounts,
+  ParticipantDropdownOption,
+  useParticipantDropdown,
+} from 'modules/Dashboard/components';
 import { Mixpanel, MixpanelEventType, MixpanelProps } from 'shared/utils';
 import { useGetAppletActivitiesQuery } from 'modules/Dashboard/api/apiSlice';
 
@@ -95,6 +100,18 @@ export const ActivityAssignDrawer = React.memo(
       appletId,
     });
 
+    // Remember participants picked via search so they remain resolvable after selection
+    const [selectedParticipants, setSelectedParticipants] = useState<ParticipantDropdownOption[]>(
+      [],
+    );
+    const knownParticipants = useMemo(
+      () => unionBy(allParticipants, selectedParticipants, 'id'),
+      [allParticipants, selectedParticipants],
+    );
+    const handleParticipantSelect = useCallback((option: ParticipantDropdownOption | null) => {
+      if (option) setSelectedParticipants((prev) => unionBy(prev, [option], 'id'));
+    }, []);
+
     const {
       data: activitiesData,
       isLoading: isLoadingActivities,
@@ -438,6 +455,8 @@ export const ActivityAssignDrawer = React.memo(
         }, 300);
       } else {
         removeAllBanners();
+        // Drop remembered search selections so they don't linger into the next session
+        setSelectedParticipants([]);
       }
     }, [open, allParticipants]); // eslint-disable-line react-hooks/exhaustive-deps
 
@@ -603,6 +622,8 @@ export const ActivityAssignDrawer = React.memo(
                       <AssignmentsTable
                         {...dropdownProps}
                         allParticipants={allParticipants}
+                        knownParticipants={knownParticipants}
+                        onParticipantSelect={handleParticipantSelect}
                         assignments={value}
                         onChange={onChange}
                         onAdd={() =>
@@ -645,6 +666,7 @@ export const ActivityAssignDrawer = React.memo(
                     <ActivityReview
                       {...dropdownProps}
                       allParticipants={allParticipants}
+                      knownParticipants={knownParticipants}
                       key={flow.id}
                       isSingleActivity={flowIds.length + activityIds.length === 1}
                       index={index}
@@ -666,6 +688,7 @@ export const ActivityAssignDrawer = React.memo(
                     <ActivityReview
                       {...dropdownProps}
                       allParticipants={allParticipants}
+                      knownParticipants={knownParticipants}
                       key={activity.id}
                       isSingleActivity={flowIds.length + activityIds.length === 1}
                       index={index + flowIds.length}

src/modules/Dashboard/components/ActivityAssignDrawer/ActivityReview/ActivityReview.types.ts

@@ -1,6 +1,6 @@
 import { Activity } from 'redux/modules';
 import { HydratedActivityFlow } from 'modules/Dashboard/types';
-import { useParticipantDropdown } from 'modules/Dashboard/components';
+import { ParticipantDropdownOption, useParticipantDropdown } from 'modules/Dashboard/components';
 
 import { ValidActivityAssignment } from '../ActivityAssignDrawer.types';
 
@@ -19,6 +19,8 @@ export type ActivityReviewProps = {
   index: number;
   assignments: ValidActivityAssignment[];
   onDelete: (activityOrFlow: Activity | HydratedActivityFlow) => void;
+  // Forwarded to the read-only table so search-selected participants resolve
+  knownParticipants?: ParticipantDropdownOption[];
   'data-testid': string;
 } & (ActivityReviewWithActivity | ActivityReviewWithFlow) &
   Omit<ReturnType<typeof useParticipantDropdown>, 'isLoading'>;

src/modules/Dashboard/components/ActivityAssignDrawer/AssignmentsTable/AssignmentsTable.tsx

@@ -19,6 +19,8 @@ import { getHeadCells } from './AssignmentsTable.utils';
 
 export const AssignmentsTable = ({
   allParticipants,
+  knownParticipants,
+  onParticipantSelect,
   participantsOnly,
   fullAccountParticipantsAndTeamMembers,
   teamMembersOnly,
@@ -34,20 +36,28 @@ export const AssignmentsTable = ({
   const {
     featureFlags: { enableParticipantMultiInformant },
   } = useFeatureFlags();
+  // Resolve selected ids from the wider list when provided, falling back to the snapshot
+  const resolveParticipants = knownParticipants ?? allParticipants;
   const lastAssignment = assignments[assignments.length - 1];
   const showAddButton =
     !isReadOnly && lastAssignment?.respondentSubjectId && lastAssignment?.targetSubjectId;
 
   const handleChange = useCallback(
-    ({ respondentSubjectId, targetSubjectId }: ActivityAssignment, index: number) => {
+    (
+      { respondentSubjectId, targetSubjectId }: ActivityAssignment,
+      index: number,
+      respondentOption?: ParticipantDropdownOption | null,
+    ) => {
       const updatedAssignments = [...assignments];
 
       if (respondentSubjectId !== undefined || targetSubjectId !== undefined) {
         if (respondentSubjectId !== undefined) {
           // Set as self-assigned if newly selected respondent is a full account, and either:
           // - no target subject has been selected yet, or
           // - current assignment is a self-assignment (to preserve "Self" in the right column)
-          const respondent = allParticipants.find(({ id }) => id === respondentSubjectId);
+          // Prefer the just-picked option since it may not be in the resolve list yet
+          const respondent =
+            respondentOption ?? resolveParticipants.find(({ id }) => id === respondentSubjectId);
           if (respondent?.userId && !respondent.isTeamMember) {
             if (
               !assignments[index].targetSubjectId ||
@@ -65,7 +75,7 @@ export const AssignmentsTable = ({
         onChange?.(updatedAssignments);
       }
     },
-    [allParticipants, assignments, onChange],
+    [resolveParticipants, assignments, onChange],
   );
 
   const handleAdd = useCallback(() => {
@@ -105,11 +115,13 @@ export const AssignmentsTable = ({
   const rows: DashboardTableProps['rows'] = useMemo(
     () =>
       assignments.map(({ respondentSubjectId, targetSubjectId }, index) => {
+        // Resolve from the wider list so search-selected participants still render
         const respondent =
-          (respondentSubjectId && allParticipants.find(({ id }) => id === respondentSubjectId)) ||
+          (respondentSubjectId &&
+            resolveParticipants.find(({ id }) => id === respondentSubjectId)) ||
           null;
         const subject =
-          (targetSubjectId && allParticipants.find(({ id }) => id === targetSubjectId)) || null;
+          (targetSubjectId && resolveParticipants.find(({ id }) => id === targetSubjectId)) || null;
 
         const selfOption: ParticipantDropdownOption | null =
           respondent && !respondent.isTeamMember
@@ -143,9 +155,10 @@ export const AssignmentsTable = ({
                     ? fullAccountParticipantsAndTeamMembers
                     : teamMembersOnly
                 }
-                onChange={(value) =>
-                  handleChange({ respondentSubjectId: value && value.id }, index)
-                }
+                onChange={(value) => {
+                  onParticipantSelect?.(value);
+                  handleChange({ respondentSubjectId: value && value.id }, index, value);
+                }}
                 handleSearch={handleRespondentSearch}
                 showGroups
                 emptyValueError={subjectValue && !subject?.userId ? t('addRespondent') : undefined}
@@ -163,7 +176,10 @@ export const AssignmentsTable = ({
                 isReadOnly={isReadOnly}
                 value={subjectValue}
                 options={subjectOptions}
-                onChange={(value) => handleChange({ targetSubjectId: value && value.id }, index)}
+                onChange={(value) => {
+                  onParticipantSelect?.(value);
+                  handleChange({ targetSubjectId: value && value.id }, index);
+                }}
                 handleSearch={(query) => handleSubjectSearch(query, selfOption)}
                 groupBy={(option) => (option.id === selfOption?.id ? 'self' : 'other')}
                 renderGroup={(params) => (
@@ -186,7 +202,8 @@ export const AssignmentsTable = ({
         };
       }),
     [
-      allParticipants,
+      resolveParticipants,
+      onParticipantSelect,
       assignments,
       dataTestId,
       enableParticipantMultiInformant,

src/modules/Dashboard/components/ActivityAssignDrawer/AssignmentsTable/AssignmentsTable.types.ts

@@ -15,6 +15,10 @@ export type AssignmentsTableProps = Omit<ReturnType<typeof useParticipantDropdow
   errors?: {
     duplicateRows?: `${string}_${string}`[];
   };
+  // Superset of allParticipants used to resolve selected ids (e.g. ones found via search)
+  knownParticipants?: ParticipantDropdownOption[];
+  // Reports each picked option so the parent can remember participants not in the snapshot
+  onParticipantSelect?: (option: ParticipantDropdownOption | null) => void;
   'data-testid': string;
 };
 

src/shared/components/Footer/Footer.const.ts

@@ -1,6 +1,6 @@
 export const CMI_LINK = 'https://childmind.org';
-export const PRIVACY_LINK = 'https://mindlogger.org/privacy-policy';
-export const TERMS_LINK = 'https://mindlogger.org/terms';
-export const ABOUT_LINK = 'https://mindlogger.org';
+export const PRIVACY_LINK = 'https://www.gettingcurious.com/privacy-policy';
+export const TERMS_LINK = 'https://www.gettingcurious.com/terms';
+export const ABOUT_LINK = 'https://www.gettingcurious.com';
 export const CREDITS_LINK = 'https://www.gettingcurious.com/open-source-credits';
-export const SUPPORT_LINK = 'https://help.mindlogger.org';
+export const SUPPORT_LINK = 'https://help.gettingcurious.com';