Răsfoiți Sursa

Revert "resolved conflict"

This reverts commit 9b361775a8a4b059ff36c0992c87a965a282d6e0.
yuken 4 ani în urmă
părinte
comite
4bbbc2cf51
1 a modificat fișierele cu 35 adăugiri și 0 ștergeri
  1. 35 0
      packages/app/src/components/CustomNavigation/CustomNav.jsx

+ 35 - 0
packages/app/src/components/CustomNavigation/CustomNav.jsx

@@ -7,6 +7,14 @@ import {
   Nav, NavItem, NavLink,
 } from 'reactstrap';
 
+<<<<<<< HEAD
+import { toastSuccess } from '~/client/util/apiNotification';
+import { useCurrentPagePath } from '~/stores/context';
+import { usePageDeleteModal } from '~/stores/modal';
+import { useSWRxDescendantsPageListForCurrrentPath, useSWRxPageInfoForList } from '~/stores/page';
+
+=======
+>>>>>>> feat/93162-create-empty-trash-in-trash-page
 
 function getBreakpointOneLevelLarger(breakpoint) {
   switch (breakpoint) {
@@ -105,6 +113,33 @@ export const CustomNavTab = (props) => {
     }
   }, [onNavSelected]);
 
+<<<<<<< HEAD
+  const pageIds = pagingResult?.items?.map(page => page._id);
+  const { injectTo } = useSWRxPageInfoForList(pageIds, true, true);
+
+  let pageWithMetas = [];
+
+  const convertToIDataWithMeta = (page) => {
+    return { data: page };
+  };
+
+  if (pagingResult != null) {
+    const dataWithMetas = pagingResult.items.map(page => convertToIDataWithMeta(page));
+    pageWithMetas = injectTo(dataWithMetas);
+  }
+
+  const onDeletedHandler = useCallback(() => {
+    toastSuccess(t('empty_trash'));
+
+    mutate();
+  }, [mutate, t]);
+
+  const emptyTrashClickHandler = () => {
+    openDeleteModal(pageWithMetas, { onDeleted: onDeletedHandler, emptyTrash: true });
+  };
+
+=======
+>>>>>>> feat/93162-create-empty-trash-in-trash-page
   function registerNavLink(key, elm) {
     if (elm != null) {
       navTabRefs[key] = elm;