[TAN-3370] Revert FE changes

CitizenLabDotCo · Dec 16, 2024 · f2de028 · f2de028
1 parent 50aed50
commit f2de028
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 0 deletions.
diff --git a/front/app/api/admin_publications/types.ts b/front/app/api/admin_publications/types.ts
@@ -17,6 +17,7 @@ export interface IQueryParameters {
   pageNumber?: number;
   pageSize?: number;
   rootLevelOnly?: boolean;
+  removeNotAllowedParents?: boolean;
   onlyProjects?: boolean;
   filter_is_moderator_of?: boolean;
   filter_user_is_moderator_of?: string;

diff --git a/front/app/api/admin_publications/useAdminPublications.ts b/front/app/api/admin_publications/useAdminPublications.ts
@@ -16,6 +16,7 @@ export const fetchAdminPublications = (filters: IQueryParameters) => {
     pageNumber,
     pageSize,
     rootLevelOnly,
+    removeNotAllowedParents,
     publicationStatusFilter,
     childrenOfId,
     topicIds,
@@ -30,6 +31,7 @@ export const fetchAdminPublications = (filters: IQueryParameters) => {
       'page[number]': pageNumber || 1,
       'page[size]': pageSize || 1000,
       depth: rootLevelOnly ? 0 : undefined,
+      remove_not_allowed_parents: removeNotAllowedParents,
       publication_statuses: publicationStatusFilter,
       folder: childrenOfId,
       topics: topicIds,

diff --git a/front/app/api/admin_publications_status_counts/useAdminPublicationsStatusCounts.ts b/front/app/api/admin_publications_status_counts/useAdminPublicationsStatusCounts.ts
@@ -10,6 +10,7 @@ import { IStatusCounts, AdminPublicationsStatusCountsKeys } from './types';
 
 export const fetchStatusCounts = ({
   rootLevelOnly,
+  removeNotAllowedParents,
   publicationStatusFilter,
   childrenOfId,
   topicIds,
@@ -25,6 +26,7 @@ export const fetchStatusCounts = ({
       'page[size]': undefined,
       'page[number]': undefined,
       depth: rootLevelOnly ? 0 : undefined,
+      remove_not_allowed_parents: removeNotAllowedParents,
       publication_statuses: publicationStatusFilter,
       folder: childrenOfId,
       topics: topicIds,

diff --git a/front/app/components/ProjectAndFolderCards/index.tsx b/front/app/components/ProjectAndFolderCards/index.tsx
@@ -67,6 +67,7 @@ const ProjectAndFolderCards = ({
       {
         publicationStatusFilter: PUBLICATION_STATUSES,
         rootLevelOnly,
+        removeNotAllowedParents: true,
         topicIds,
         areaIds,
         search,
@@ -85,6 +86,7 @@ const ProjectAndFolderCards = ({
     pageSize: 6,
     publicationStatusFilter: getPublicationStatuses(currentTab),
     rootLevelOnly,
+    removeNotAllowedParents: true,
     topicIds,
     areaIds,
     search,
@@ -134,6 +136,7 @@ const ProjectAndFolderCardsWrapper = (props: Props) => {
     {
       publicationStatusFilter: PUBLICATION_STATUSES,
       rootLevelOnly: true,
+      removeNotAllowedParents: true,
     }
   );
 

diff --git a/...iners/Admin/pagesAndMenu/containers/ContentBuilder/components/Widgets/Published/index.tsx b/...iners/Admin/pagesAndMenu/containers/ContentBuilder/components/Widgets/Published/index.tsx
@@ -25,6 +25,7 @@ const Published = ({ titleMultiloc }: Props) => {
       pageSize: 6,
       publicationStatusFilter: ['published'],
       rootLevelOnly: true,
+      removeNotAllowedParents: true,
       include_publications: true,
     });
 

diff --git a/front/app/containers/CustomPageShow/CustomPageProjectsAndEvents.tsx b/front/app/containers/CustomPageShow/CustomPageProjectsAndEvents.tsx
@@ -73,6 +73,7 @@ const CustomPageProjectsAndEvents = ({
     areaIds,
     publicationStatusFilter: getPublicationStatuses(currentTab),
     rootLevelOnly: false,
+    removeNotAllowedParents: true,
     onlyProjects: true,
   });
 
@@ -137,6 +138,7 @@ const CustomPageProjectsAndEventsWrapper = ({ page }: Props) => {
       areaIds,
       publicationStatusFilter: PUBLICATION_STATUSES,
       rootLevelOnly: false,
+      removeNotAllowedParents: true,
       onlyProjects: true,
     }
   );

diff --git a/front/app/containers/MainHeader/Components/DesktopNavItems/AdminPublicationsNavbarItem.tsx b/front/app/containers/MainHeader/Components/DesktopNavItems/AdminPublicationsNavbarItem.tsx
@@ -154,6 +154,7 @@ const AdminPublicationsNavbarItem = ({
     {
       publicationStatusFilter: ['published', 'archived'],
       rootLevelOnly: true,
+      removeNotAllowedParents: true,
     },
     { enabled: projectsDropdownOpened }
   );

diff --git a/front/app/containers/SiteMap/ProjectsAndFoldersSection.tsx b/front/app/containers/SiteMap/ProjectsAndFoldersSection.tsx
@@ -27,6 +27,7 @@ const ProjectsAndFoldersSection = ({ projectsSectionRef }: Props) => {
   const { data } = useAdminPublications({
     publicationStatusFilter: ['draft', 'published', 'archived'],
     rootLevelOnly: true,
+    removeNotAllowedParents: true,
   });
 
   const adminPublications = data?.pages.map((page) => page.data).flat();