Compare commits

...

3 Commits

Author SHA1 Message Date
3e2d601739 removed unused and added child id 2025-08-24 16:11:20 +05:30
2377a1b869 removed unused code 2025-08-24 16:10:25 +05:30
e1ecaf7a31 added default range set or not flag 2025-08-24 16:09:51 +05:30
8 changed files with 16 additions and 26 deletions

View File

@ -34,7 +34,6 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
isLoading, isLoading,
error: ExpenseErrorLoad, error: ExpenseErrorLoad,
} = useExpense(expenseToEdit); } = useExpense(expenseToEdit);
console.log(data)
const [ExpenseType, setExpenseType] = useState(); const [ExpenseType, setExpenseType] = useState();
const dispatch = useDispatch(); const dispatch = useDispatch();
const { const {

View File

@ -7,7 +7,7 @@ import { MenuItemSkeleton } from "./MenuItemSkeleton";
const Sidebar = () => { const Sidebar = () => {
const navigate = useNavigate(); const navigate = useNavigate();
const { data, isError, isLoading, isFetched,error } = useSidBarMenu(); const { data, isError, isLoading, isFetched, error } = useSidBarMenu();
return ( return (
<aside <aside
id="layout-menu" id="layout-menu"
@ -35,7 +35,6 @@ const Sidebar = () => {
<div className="menu-inner-shadow"></div> <div className="menu-inner-shadow"></div>
<ul className="menu-inner py-1"> <ul className="menu-inner py-1">
{isError && ( {isError && (
<div className="text-center text-small">{error.message}</div> <div className="text-center text-small">{error.message}</div>
)} )}
@ -52,13 +51,17 @@ const Sidebar = () => {
)} )}
{data && {data &&
data?.data.map((section) => ( 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 && ( {/* {section.header && (
<li className="menu-header small text-uppercase"> <li className="menu-header small text-uppercase">
<span className="menu-header-text">{section.header}</span> <span className="menu-header-text">{section.header}</span>
</li> </li>
)} */} )} */}
{section.items.map(MenuItem)} {section.items.map((item) => (
<MenuItem key={item.id || item.link} {...item} />
))}
</React.Fragment> </React.Fragment>
))} ))}
</ul> </ul>

View File

@ -56,6 +56,7 @@ const [resetKey, setResetKey] = useState(0);
startField="startDate" startField="startDate"
endField="endDate" endField="endDate"
resetSignal={resetKey} resetSignal={resetKey}
defaultRange={false}
/> />
</div> </div>
<div className="text-strat mb-2"> <div className="text-strat mb-2">

View File

@ -76,7 +76,8 @@ export const DateRangePicker1 = ({
placeholder = "Select date range", placeholder = "Select date range",
className = "", className = "",
allowText = false, allowText = false,
resetSignal, // <- NEW prop resetSignal,
defaultRange = true,
...rest ...rest
}) => { }) => {
const inputRef = useRef(null); const inputRef = useRef(null);
@ -124,10 +125,9 @@ export const DateRangePicker1 = ({
...rest, ...rest,
}); });
// Apply default if empty
const currentStart = getValues(startField); const currentStart = getValues(startField);
const currentEnd = getValues(endField); const currentEnd = getValues(endField);
if (!currentStart && !currentEnd) { if (defaultRange && !currentStart && !currentEnd) {
applyDefaultDates(); applyDefaultDates();
} else if (currentStart && currentEnd) { } else if (currentStart && currentEnd) {
instance.setDate([ instance.setDate([
@ -139,12 +139,11 @@ export const DateRangePicker1 = ({
return () => instance.destroy(); return () => instance.destroy();
}, []); }, []);
// Reapply default range on resetSignal change
useEffect(() => { useEffect(() => {
if (resetSignal !== undefined) { if (defaultRange && resetSignal !== undefined) {
applyDefaultDates(); applyDefaultDates();
} }
}, [resetSignal]); }, [resetSignal, defaultRange]);
const start = getValues(startField); const start = getValues(startField);
const end = getValues(endField); const end = getValues(endField);
@ -173,3 +172,4 @@ export const DateRangePicker1 = ({
</div> </div>
); );
}; };

View File

@ -15,7 +15,6 @@ export const useMasterMenu = ()=>{
return useQuery({ return useQuery({
queryKey:["MasterMenu"], queryKey:["MasterMenu"],
queryFn:async()=> { queryFn:async()=> {
debugger
const resp = await MasterRespository.getMasterMenus(); const resp = await MasterRespository.getMasterMenus();
return resp.data return resp.data
} }

View File

@ -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; return cleaned;
}; };

View File

@ -21,7 +21,6 @@ const DailyTask = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const selectedProject = useSelectedproject(); const selectedProject = useSelectedproject();
const { projectNames } = useProjectName(); const { projectNames } = useProjectName();
console.log(selectedProject)
const ApprovedTaskRights = useHasUserPermission(APPROVE_TASK); const ApprovedTaskRights = useHasUserPermission(APPROVE_TASK);
const ReportTaskRights = useHasUserPermission(ASSIGN_REPORT_TASK); const ReportTaskRights = useHasUserPermission(ASSIGN_REPORT_TASK);

View File

@ -64,7 +64,7 @@ const TenantDetails = ({
}, },
]; ];
return ManageTenant && ModifyTenant return ManageTenant
? allTabs ? allTabs
: [allTabs[0], allTabs[allTabs.length - 1]]; : [allTabs[0], allTabs[allTabs.length - 1]];
}, [data, activeTenantId, ManageTenant, ModifyTenant]); }, [data, activeTenantId, ManageTenant, ModifyTenant]);