Merge branch '309220_celery_queues' of github.com:unicef/hope into 309220_celery_queues

Author: marekbiczysko

src/frontend/src/containers/dialogs/programs/ActivateProgram.tsx

@@ -3,13 +3,11 @@ import { useBaseUrl } from '@hooks/useBaseUrl';
 import { useSnackbar } from '@hooks/useSnackBar';
 import { Button, Dialog, DialogContent, DialogTitle } from '@mui/material';
 import { ProgramDetail } from '@restgenerated/models/ProgramDetail';
-import { ProgramStatusEnum } from '@restgenerated/models/ProgramStatusEnum';
 import { RestService } from '@restgenerated/services/RestService';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { showApiErrorMessages } from '@utils/utils';
 import { ReactElement, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useProgramContext } from '../../../programContext';
 import { DialogActions } from '../DialogActions';
 import { DialogDescription } from '../DialogDescription';
 import { DialogFooter } from '../DialogFooter';
@@ -27,7 +25,6 @@ export const ActivateProgram = ({
   const [open, setOpen] = useState(false);
   const { showMessage } = useSnackbar();
   const { businessArea } = useBaseUrl();
-  const { selectedProgram, setSelectedProgram } = useProgramContext();
   const queryClient = useQueryClient();
 
   const { mutateAsync: activateProgram, isPending: loading } = useMutation({
@@ -37,10 +34,6 @@ export const ActivateProgram = ({
         code: program.code,
       }),
     onSuccess: () => {
-      setSelectedProgram({
-        ...selectedProgram,
-        status: ProgramStatusEnum.ACTIVE,
-      });
       showMessage(t('Programme activated.'));
       queryClient.invalidateQueries({
         queryKey: ['program', businessArea, program.code],

src/frontend/src/containers/tables/ProgramCycle/NewProgramCycle/AddNewProgramCycle.tsx

@@ -2,50 +2,34 @@ import { ButtonTooltip } from '@components/core/ButtonTooltip';
 import withErrorBoundary from '@components/core/withErrorBoundary';
 import CreateProgramCycle from '@containers/tables/ProgramCycle/NewProgramCycle/CreateProgramCycle';
 import UpdateProgramCycle from '@containers/tables/ProgramCycle/NewProgramCycle/UpdateProgramCycle';
-import { useBaseUrl } from '@hooks/useBaseUrl';
 import { usePermissions } from '@hooks/usePermissions';
 import AddIcon from '@mui/icons-material/Add';
 import { Dialog } from '@mui/material';
-import { RestService } from '@restgenerated/index';
 import { ProgramCycleList } from '@restgenerated/models/ProgramCycleList';
 import { ProgramDetail } from '@restgenerated/models/ProgramDetail';
 import { ProgramStatusEnum } from '@restgenerated/models/ProgramStatusEnum';
-import { useQuery, useQueryClient } from '@tanstack/react-query';
+import { useQueryClient } from '@tanstack/react-query';
 import { ReactElement, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { hasPermissions, PERMISSIONS } from 'src/config/permissions';
-import { useProgramContext } from 'src/programContext';
 
 interface AddNewProgramCycleProps {
+  program: ProgramDetail;
   lastProgramCycle?: ProgramCycleList;
 }
 
 const AddNewProgramCycle = ({
+  program,
   lastProgramCycle,
 }: AddNewProgramCycleProps): ReactElement => {
   const { t } = useTranslation();
   const [open, setOpen] = useState(false);
   const [step, setStep] = useState(0);
   const queryClient = useQueryClient();
-  const { businessArea } = useBaseUrl();
   const permissions = usePermissions();
-  const { selectedProgram } = useProgramContext();
-
-  const { data: program } = useQuery<ProgramDetail>({
-    queryKey: ['program', businessArea, selectedProgram.code],
-    queryFn: () =>
-      RestService.restBusinessAreasProgramsRetrieve({
-        businessAreaSlug: businessArea,
-        code: selectedProgram.code,
-      }),
-  });
-
-  if (!program) {
-    return null;
-  }
 
   const canCreateProgramCycle =
-    selectedProgram.status === ProgramStatusEnum.ACTIVE &&
+    program.status === ProgramStatusEnum.ACTIVE &&
     hasPermissions(PERMISSIONS.PM_PROGRAMME_CYCLE_CREATE, permissions);
 
   const handleClose = async () => {

src/frontend/src/containers/tables/ProgramCycle/ProgramCyclesTableProgramDetails.tsx

@@ -161,6 +161,7 @@ const ProgramCyclesTableProgramDetails = ({
   const actions = [
     <AddNewProgramCycle
       key="add-new"
+      program={program}
       lastProgramCycle={(data?.results || [])[(data?.results || []).length - 1]}
     />,
   ];

src/frontend/src/containers/tables/ProgramCyclesTablePaymentModule/ProgramCyclesTablePaymentModule.tsx

@@ -194,6 +194,7 @@ export const ProgramCyclesTablePaymentModule = ({
   const actions = [
     <AddNewProgramCycle
       key="add-new"
+      program={program}
       lastProgramCycle={(data?.results || [])[(data?.results || []).length - 1]}
     />,
   ];