fix: revert

Author: henrikmv

src/core_modules/capture-core/components/Pages/New/NewPage.component.tsx

@@ -34,10 +34,10 @@ const NewPagePlain = ({
     newPageStatus,
     newPageKey,
     writeAccess,
-    categoryOptionIsInvalidForOrgUnit,
-    orgUnitSelectionIncomplete,
     programCategorySelectionIncomplete,
+    categoryOptionIsInvalidForOrgUnit,
     missingCategoriesInProgramSelection,
+    orgUnitSelectionIncomplete,
     trackedEntityName,
     trackedEntityInstanceAttributes,
 }: Props) => {
@@ -60,11 +60,13 @@ const NewPagePlain = ({
         }
     },
     [
+        programCategorySelectionIncomplete,
         orgUnitSelectionIncomplete,
         showMessageToSelectOrgUnitOnNewPage,
         showDefaultViewOnNewPage,
         programCategorySelectionIncomplete,
         showMessageToSelectProgramCategoryOnNewPage,
+        showDefaultViewOnNewPage,
         categoryOptionIsInvalidForOrgUnit,
         showMessageThatCategoryOptionIsInvalidForOrgUnit,
     ]);

src/core_modules/capture-core/components/Pages/New/NewPage.container.tsx

@@ -6,19 +6,18 @@ import { NewPageComponent } from './NewPage.component';
 import {
     showMessageToSelectOrgUnitOnNewPage,
     showDefaultViewOnNewPage,
-    showMessageThatCategoryOptionIsInvalidForOrgUnit,
-    showMessageToSelectProgramCategoryOnNewPage,
+    showMessageToSelectProgramCategoryOnNewPage, showMessageThatCategoryOptionIsInvalidForOrgUnit,
 } from './NewPage.actions';
 import { newPageStatuses } from './NewPage.constants';
 import { useNavigate, buildUrlQueryString, useLocationQuery } from '../../../utils/routing';
 import { getScopeFromScopeId, TrackerProgram, TrackedEntityType, EventProgram } from '../../../metaData';
+import { useMissingCategoriesInProgramSelection } from '../../../hooks/useMissingCategoriesInProgramSelection';
 import { dataEntryHasChanges } from '../../DataEntry/common/dataEntryHasChanges';
 import { useTrackedEntityAttributes } from './hooks';
 import { deriveTeiName } from '../common/EnrollmentOverviewDomain/useTeiDisplayName';
 import { programCollection } from '../../../metaDataMemoryStores/programCollection/programCollection';
 import { useCategoryOptionIsValidForOrgUnit } from '../../../hooks/useCategoryComboIsValidForOrgUnit';
 import { TopBar } from './TopBar.container';
-import { useMissingCategoriesInProgramSelection } from '../../../hooks/useMissingCategoriesInProgramSelection';
 
 const useUserWriteAccess = (scopeId: string) => {
     const scope = getScopeFromScopeId(scopeId);
@@ -83,6 +82,8 @@ export const NewPage: ComponentType<Record<string, never>> = () => {
     const currentScopeId: string =
         useSelector(({ currentSelections }: any) => currentSelections.programId || currentSelections.trackedEntityTypeId);
 
+    const { missingCategories, programSelectionIsIncomplete } = useMissingCategoriesInProgramSelection();
+
     // TODO: OrgUnitSelectionIncomplete should be removed when DHIS2-19171 is implemented
     const orgUnitSelectionIncomplete: boolean = useSelector(
         ({ currentSelections }: any) =>
@@ -98,11 +99,6 @@ export const NewPage: ComponentType<Record<string, never>> = () => {
         navigate(`/?${buildUrlQueryString({ orgUnitId, programId })}`);
     };
 
-    const { missingCategories, programSelectionIsIncomplete } = useMissingCategoriesInProgramSelection();
-
-    const programCategorySelectionIncomplete: boolean =
-        (program instanceof TrackerProgram) ? programSelectionIsIncomplete : false;
-
     const writeAccess = useUserWriteAccess(currentScopeId);
 
     const isUserInteractionInProgress: boolean = useSelector(
@@ -140,7 +136,7 @@ export const NewPage: ComponentType<Record<string, never>> = () => {
                 handleMainPageNavigation={handleMainPageNavigation}
                 currentScopeId={currentScopeId}
                 orgUnitSelectionIncomplete={orgUnitSelectionIncomplete}
-                programCategorySelectionIncomplete={programCategorySelectionIncomplete}
+                programCategorySelectionIncomplete={programSelectionIsIncomplete}
                 missingCategoriesInProgramSelection={missingCategories}
                 categoryOptionIsInvalidForOrgUnit={categoryOptionIsInvalidForOrgUnit}
                 writeAccess={writeAccess}

src/core_modules/capture-core/components/Pages/New/NewPage.types.ts

@@ -1,6 +1,8 @@
 import type { newPageStatuses } from './NewPage.constants';
 import { dataElementTypes } from '../../../metaData';
 
+type ProgramCategories = Array<{ name: string; id: string }>;
+
 type InputAttribute = {
   attribute: string;
   code: string;
@@ -21,7 +23,7 @@ export type ContainerProps = {
   currentScopeId: string;
   orgUnitSelectionIncomplete: boolean;
   programCategorySelectionIncomplete: boolean;
-  missingCategoriesInProgramSelection: Array<{ name: string; id: string }>;
+  missingCategoriesInProgramSelection: ProgramCategories;
   newPageStatus: keyof typeof newPageStatuses;
   writeAccess: boolean;
   error: boolean;