fix publication configuration bugs

parlemonde · Dec 13, 2024 · 15b77bb · 15b77bb
1 parent cf844f5
commit 15b77bb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/server/controllers/activity.ts b/server/controllers/activity.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import type { JSONSchemaType } from 'ajv';
 import type { NextFunction, Request, Response } from 'express';
 import { IsNull } from 'typeorm';

diff --git a/src/components/activities/ActivityCard/activity-admin/ActivityCardAdmin.tsx b/src/components/activities/ActivityCard/activity-admin/ActivityCardAdmin.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import React, { useEffect } from 'react';
@@ -60,7 +59,6 @@ export default function ActivityCard({
     setAnchorEl(null);
   };
   const handleUpdate = () => {
-    console.log(activity);
     if (activity.type === 5) {
       router.push(`/admin/newportal/contenulibre/edit/1/${activity.id}`);
     }

diff --git a/src/contexts/activityContext.tsx b/src/contexts/activityContext.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import { useRouter } from 'next/router';
 import React from 'react';
 import { useQueryClient } from 'react-query';

diff --git a/src/pages/admin/newportal/publier/prepublish/edit/[id].tsx b/src/pages/admin/newportal/publier/prepublish/edit/[id].tsx
@@ -157,7 +157,7 @@ const ModifPrepublish = () => {
         const villagesToAdd = selectedVillages.filter((villageId) => !publishedVillageIds.includes(villageId));
         const villagesToDelete = publishedVillageIds.filter((villageId) => !selectedVillages.includes(villageId));
 
-        if (Number(selectedPhase) !== childrenActivities[0].phase) {
+        if (childrenActivities.length > 0 && Number(selectedPhase) !== childrenActivities[0].phase) {
           await Promise.all(
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
@@ -201,19 +201,17 @@ const ModifPrepublish = () => {
   const isModificationDisabled = () => {
     if (isLoading) return true;
 
-    const publishedVillageIds = childrenActivities.map((activity: Activity) => activity.villageId).filter((id: number) => id !== undefined); // Exclude undefined IDs
-
     const hasPublishedVillages = publishedVillageIds.length > 0;
     const hasSelectedVillages = selectedVillages.length > 0;
 
-    // Check if published and selected have the same numbers
     const areVillagesTheSame =
-      hasPublishedVillages &&
-      hasSelectedVillages &&
-      publishedVillageIds.length === selectedVillages.length &&
-      publishedVillageIds.every((id: number) => selectedVillages.includes(id));
+      publishedVillageIds.length === selectedVillages.length && publishedVillageIds.every((id: number) => selectedVillages.includes(id));
+
+    const phaseChanged = childrenActivities.length > 0 && childrenActivities[0]?.phase !== Number(selectedPhase);
+
+    const noChangesMade = areVillagesTheSame && !phaseChanged;
 
-    return (selectedVillages.length < 1 && publishedVillageIds.length === 0) || areVillagesTheSame;
+    return (!hasSelectedVillages && !hasPublishedVillages) || noChangesMade;
   };
 
   return (