create: Merge from master to dev

src/components/ProfileMenu/ProfileMenu.test.tsx

@@ -7,11 +7,14 @@ import { Util } from '../../utility/util';
 import { useAppSelector } from '../../redux/hooks';
 import { MemoryRouter } from 'react-router-dom';
 import {
+  CURRENT_MODE,
   EVENTS,
+  MODES,
   PAGES,
   STICKER_BOOK_NOTIFICATION_DOT_ENABLED,
   ENABLE_STICKER_BOOK,
 } from '../../common/constants';
+import { schoolUtil } from '../../utility/schoolUtil';
 
 // --- Mocks ---
 
@@ -36,15 +39,22 @@ jest.mock('../../i18n', () => ({
 }));
 
 const mockPush = jest.fn();
+const mockReplace = jest.fn();
 jest.mock('react-router', () => ({
   ...jest.requireActual('react-router'),
   useHistory: () => ({
     push: mockPush,
-    replace: jest.fn(),
+    replace: mockReplace,
     location: { pathname: '/' },
   }),
 }));
 
+jest.mock('../../utility/schoolUtil', () => ({
+  schoolUtil: {
+    setCurrentClass: jest.fn(),
+  },
+}));
+
 // Mock useGbContext
 jest.mock('../../growthbook/Growthbook', () => ({
   useGbContext: () => ({ setGbUpdated: jest.fn() }),
@@ -60,10 +70,12 @@ const mockApi = {
 };
 
 const mockStudent = { id: 'student-123', name: 'Test Student' };
+const mockSetCurrentClass = schoolUtil.setCurrentClass as jest.Mock;
 
 describe('ProfileMenu Notification Logic', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    localStorage.clear();
     mockApi.getUserStickerBook.mockReset();
     mockApi.getUserStickerBook.mockResolvedValue([]);
     mockApi.markStciekercolledasTrue.mockReset();
@@ -191,4 +203,30 @@ describe('ProfileMenu Notification Logic', () => {
       expect.any(Object),
     );
   });
+
+  test('keeps school-mode switch profile on SelectMode selection flow', async () => {
+    localStorage.setItem(CURRENT_MODE, MODES.TEACHER_SCHOOL);
+
+    render(
+      <MemoryRouter>
+        <ProfileMenu onClose={jest.fn()} />
+      </MemoryRouter>,
+    );
+
+    await waitFor(() => expect(mockApi.getUserStickerBook).toHaveBeenCalled());
+
+    const switchProfileItem = screen
+      .getByText(/Switch Profile/i)
+      .closest('.profile-menu-item');
+    fireEvent.click(switchProfileItem!);
+
+    await waitFor(() => {
+      expect(Util.setCurrentStudent).toHaveBeenCalledWith(null);
+    });
+    expect(mockSetCurrentClass).not.toHaveBeenCalled();
+    expect(mockReplace).toHaveBeenCalledWith(PAGES.SELECT_MODE, {
+      from: '/',
+      fromSchoolModeSwitchProfile: true,
+    });
+  });
 });

src/components/ProfileMenu/ProfileMenu.tsx

@@ -177,6 +177,7 @@ const ProfileMenu = ({ onClose }: ProfileMenuProps) => {
     setGbUpdated(true);
     history.replace(PAGES.SELECT_MODE, {
       from: history.location.pathname,
+      fromSchoolModeSwitchProfile: true,
     });
   };
 

src/ops-console/components/DataTableBody.css

@@ -6,7 +6,8 @@
   scrollbar-gutter: stable;
   margin-bottom: 8px;
   -webkit-overflow-scrolling: touch;
-  touch-action: pan-x pan-y;
+  overscroll-behavior: contain;
+  touch-action: pan-x pan-y pinch-zoom;
 }
 
 .data-tablebody-head-cell {

src/ops-console/components/ProgramListTable.tsx

@@ -40,6 +40,7 @@ type ProgramListTableProps = {
   isExportDisabled: boolean;
   isExporting: boolean;
   onExport: () => void | Promise<void>;
+  canCreateProgram: boolean;
   onNewProgram: () => void;
   columns: Column<ProgramListRow>[];
   rows: ProgramListRow[];
@@ -88,7 +89,9 @@ const ProgramListControls: React.FC<ProgramListTableProps> = (props) => (
           isExporting={props.isExporting}
           onClick={props.onExport}
         />
-        <ProgramActionsMenu onNewProgram={props.onNewProgram} />
+        {props.canCreateProgram ? (
+          <ProgramActionsMenu onNewProgram={props.onNewProgram} />
+        ) : null}
         <SchoolListDateRangeDropdown
           value={props.selectedDateRange}
           onChange={props.onDateRangeChange}

src/ops-console/components/campaignMessages/CampaignMessages.test.tsx

@@ -255,6 +255,36 @@ describe('CampaignMessages', () => {
     ).not.toBeInTheDocument();
   });
 
+  it('revokes message editing immediately when the campaign is cancelled', async () => {
+    apiHandler.getCampaignMessaging.mockResolvedValue(
+      buildResponse([buildMessagingRow()]),
+    );
+
+    const { rerender } = render(
+      <CampaignMessages campaignId="campaign-1" isCampaignCancelled={false} />,
+    );
+
+    await screen.findByText('Class 1 Digital');
+    fireEvent.click(screen.getByLabelText('Edit global send schedule'));
+    expect(
+      screen.getByRole('button', { name: 'Save Changes' }),
+    ).toBeInTheDocument();
+
+    rerender(<CampaignMessages campaignId="campaign-1" isCampaignCancelled />);
+
+    await waitFor(() =>
+      expect(
+        screen.queryByLabelText('Edit global send schedule'),
+      ).not.toBeInTheDocument(),
+    );
+    await waitFor(() =>
+      expect(
+        screen.queryByRole('button', { name: 'Save Changes' }),
+      ).not.toBeInTheDocument(),
+    );
+    expect(apiHandler.updateCampaignMessaging).not.toHaveBeenCalled();
+  });
+
   it('closes the message time picker after selecting a time value', async () => {
     apiHandler.getCampaignMessaging.mockResolvedValue(
       buildResponse([buildMessagingRow()]),

src/ops-console/components/campaignMessages/CampaignMessages.tsx

@@ -8,24 +8,31 @@ import {
   useCampaignMessagesController,
 } from './CampaignMessagesLogic';
 import type { CampaignMessagesScheduleType } from './CampaignMessagesLogic';
+import type { CampaignFrequency } from '../../../services/api/ServiceApi';
 import './CampaignMessages.css';
 
 interface CampaignMessagesProps {
   campaignId?: string;
   campaignStartDate?: string;
   campaignEndDate?: string;
+  campaignFrequency?: CampaignFrequency;
+  isCampaignCancelled?: boolean;
 }
 
 const CampaignMessages: React.FC<CampaignMessagesProps> = ({
   campaignId,
   campaignStartDate,
   campaignEndDate,
+  campaignFrequency,
+  isCampaignCancelled,
 }) => {
   const { t } = useTranslation();
   const controller = useCampaignMessagesController({
     campaignId,
     campaignStartDate,
     campaignEndDate,
+    campaignFrequency,
+    isCampaignCancelled,
     translate: (key) => String(t(key)),
   });
   const timePickerWrapperRefs = useRef<

src/ops-console/components/campaignMessages/CampaignMessagesLogic.ts

@@ -9,11 +9,16 @@ import {
 } from 'react';
 import { ServiceConfig } from '../../../services/ServiceConfig';
 import {
+  CampaignFrequency,
   CampaignMessagingQueryParams,
   CampaignMessagingRow,
 } from '../../../services/api/ServiceApi';
 import { hasCampaignWriteAccess } from '../../../services/api/campaignListingHelpers';
 import { Json } from '../../../services/database';
+import {
+  buildFrequencyTimelineDates,
+  DEFAULT_FREQUENCY,
+} from '../campaignSetup/campaignAssignmentUtils';
 import { buildCampaignDurationTimelineDates } from '../campaignSetup/campaignCommunicationUtils';
 import { useAppSelector } from '../../../redux/hooks';
 import { AuthState } from '../../../redux/slices/auth/authSlice';
@@ -119,6 +124,8 @@ interface UseCampaignMessagesControllerParams {
   campaignId?: string;
   campaignStartDate?: string;
   campaignEndDate?: string;
+  campaignFrequency?: CampaignFrequency;
+  isCampaignCancelled?: boolean;
   translate: (key: string) => string;
 }
 
@@ -680,12 +687,16 @@ export const useCampaignMessagesController = ({
   campaignId,
   campaignStartDate,
   campaignEndDate,
+  campaignFrequency = DEFAULT_FREQUENCY,
+  isCampaignCancelled = false,
   translate,
 }: UseCampaignMessagesControllerParams): CampaignMessagesController => {
   const { roles } = useAppSelector(
     (state: RootState) => state.auth as AuthState,
   );
-  const canEdit = hasCampaignWriteAccess(roles || []);
+  // A cancelled campaign must become read-only even when the user's role
+  // normally grants campaign write access.
+  const canEdit = !isCampaignCancelled && hasCampaignWriteAccess(roles || []);
   const [messagesData, setMessagesData] = useState<CampaignMessagesData>(
     () => emptyCampaignMessagesData,
   );
@@ -712,6 +723,17 @@ export const useCampaignMessagesController = ({
     Record<string, boolean>
   >({});
   const timelineDates = useMemo(
+    () =>
+      campaignStartDate && campaignEndDate
+        ? buildFrequencyTimelineDates(
+            campaignStartDate,
+            campaignEndDate,
+            campaignFrequency,
+          )
+        : [],
+    [campaignEndDate, campaignFrequency, campaignStartDate],
+  );
+  const campaignRangeDates = useMemo(
     () =>
       campaignStartDate && campaignEndDate
         ? buildCampaignDurationTimelineDates(campaignStartDate, campaignEndDate)
@@ -751,8 +773,8 @@ export const useCampaignMessagesController = ({
       // Fetch the full calendar range so persisted Sunday rows cannot displace
       // later non-Sunday campaign dates from the paginated response.
       const pageSize =
-        timelineDates.length > 0
-          ? timelineDates.length
+        campaignRangeDates.length > 0
+          ? campaignRangeDates.length
           : CAMPAIGN_MESSAGES_PAGE_SIZE;
       const loadedMessagesData = await loadCampaignMessagesData(
         campaignId,
@@ -774,7 +796,7 @@ export const useCampaignMessagesController = ({
     return () => {
       isMounted = false;
     };
-  }, [campaignId, displayTimelineDates, timelineDates.length]);
+  }, [campaignId, campaignRangeDates.length, displayTimelineDates]);
 
   useEffect(
     () => () => {
@@ -1078,8 +1100,8 @@ export const useCampaignMessagesController = ({
         {
           page: 1,
           pageSize:
-            timelineDates.length > 0
-              ? timelineDates.length
+            campaignRangeDates.length > 0
+              ? campaignRangeDates.length
               : CAMPAIGN_MESSAGES_PAGE_SIZE,
         },
       );

src/ops-console/components/campaignSetup/CampaignCommunicationTimelineStep.tsx

@@ -18,6 +18,7 @@ const CampaignCommunicationTimelineStep: React.FC<
   CampaignCommunicationTimelineStepProps
 > = ({
   form,
+  frequency,
   assignmentDrafts,
   selectedSchoolIds,
   communicationState,
@@ -31,8 +32,8 @@ const CampaignCommunicationTimelineStep: React.FC<
   const { t } = useTranslation();
   const timeOptions = useMemo(() => buildTimeOptions(), []);
   const timelineDates = useMemo(
-    () => buildCommunicationTimelineDates(assignmentDrafts, form),
-    [assignmentDrafts, form],
+    () => buildCommunicationTimelineDates(assignmentDrafts, form, frequency),
+    [assignmentDrafts, form, frequency],
   );
   const { campaignReach, loadingReach } = useCampaignReach(selectedSchoolIds);