removed unused and added child id
This commit is contained in:
parent
2377a1b869
commit
3e2d601739
@ -7,7 +7,7 @@ import { MenuItemSkeleton } from "./MenuItemSkeleton";
|
||||
|
||||
const Sidebar = () => {
|
||||
const navigate = useNavigate();
|
||||
const { data, isError, isLoading, isFetched,error } = useSidBarMenu();
|
||||
const { data, isError, isLoading, isFetched, error } = useSidBarMenu();
|
||||
return (
|
||||
<aside
|
||||
id="layout-menu"
|
||||
@ -35,7 +35,6 @@ const Sidebar = () => {
|
||||
<div className="menu-inner-shadow"></div>
|
||||
|
||||
<ul className="menu-inner py-1">
|
||||
|
||||
{isError && (
|
||||
<div className="text-center text-small">{error.message}</div>
|
||||
)}
|
||||
@ -52,13 +51,17 @@ const Sidebar = () => {
|
||||
)}
|
||||
{data &&
|
||||
data?.data.map((section) => (
|
||||
<React.Fragment key={(Math.random() + 1).toString(36)}>
|
||||
<React.Fragment
|
||||
key={section.id || section.header || section.items[0]?.id}
|
||||
>
|
||||
{/* {section.header && (
|
||||
<li className="menu-header small text-uppercase">
|
||||
<span className="menu-header-text">{section.header}</span>
|
||||
</li>
|
||||
)} */}
|
||||
{section.items.map(MenuItem)}
|
||||
{section.items.map((item) => (
|
||||
<MenuItem key={item.id || item.link} {...item} />
|
||||
))}
|
||||
</React.Fragment>
|
||||
))}
|
||||
</ul>
|
||||
|
@ -56,6 +56,7 @@ const [resetKey, setResetKey] = useState(0);
|
||||
startField="startDate"
|
||||
endField="endDate"
|
||||
resetSignal={resetKey}
|
||||
defaultRange={false}
|
||||
/>
|
||||
</div>
|
||||
<div className="text-strat mb-2">
|
||||
|
@ -16,18 +16,7 @@ const cleanFilter = (filter) => {
|
||||
}
|
||||
});
|
||||
|
||||
// moment.utc() to get consistent UTC ISO strings
|
||||
if (!cleaned.startDate) {
|
||||
cleaned.startDate = moment
|
||||
.utc()
|
||||
.subtract(7, "days")
|
||||
.startOf("day")
|
||||
.toISOString();
|
||||
}
|
||||
|
||||
if (!cleaned.endDate) {
|
||||
cleaned.endDate = moment.utc().startOf("day").toISOString();
|
||||
}
|
||||
|
||||
return cleaned;
|
||||
};
|
||||
|
||||
|
@ -64,7 +64,7 @@ const TenantDetails = ({
|
||||
},
|
||||
];
|
||||
|
||||
return ManageTenant && ModifyTenant
|
||||
return ManageTenant
|
||||
? allTabs
|
||||
: [allTabs[0], allTabs[allTabs.length - 1]];
|
||||
}, [data, activeTenantId, ManageTenant, ModifyTenant]);
|
||||
|
Loading…
x
Reference in New Issue
Block a user