Merge remote-tracking branch 'origin/api-integration' into v3
This commit is contained in:
commit
5dac751204
|
@ -133,7 +133,6 @@ function Point({ point }: { readonly point: Point }) {
|
||||||
const removedAisles = removeAislePoint(point.pointUuid);
|
const removedAisles = removeAislePoint(point.pointUuid);
|
||||||
if (removedAisles.length > 0) {
|
if (removedAisles.length > 0) {
|
||||||
removedAisles.forEach(aisle => {
|
removedAisles.forEach(aisle => {
|
||||||
console.log('Removed Aisle: ', aisle);
|
|
||||||
if (projectId)
|
if (projectId)
|
||||||
deleteAisleApi(aisle.aisleUuid, projectId)
|
deleteAisleApi(aisle.aisleUuid, projectId)
|
||||||
});
|
});
|
||||||
|
|
|
@ -37,27 +37,9 @@ const UserAuth: React.FC = () => {
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
const { userId, organization } = getUserData();
|
const { userId, organization } = getUserData();
|
||||||
const [navigateToProject, setNavigateToProject] = useState<any>();
|
|
||||||
console.log('navigateToProject: ', navigateToProject);
|
|
||||||
const fetchRecentProjects = async () => {
|
|
||||||
try {
|
|
||||||
const projects = await recentlyViewed(organization, userId);
|
|
||||||
console.log("RecentlyViewed: ", Object.values(projects.RecentlyViewed)[0]
|
|
||||||
);
|
|
||||||
if (Object.values(projects.RecentlyViewed).length > 0) {
|
|
||||||
const firstId = (Object.values(projects?.RecentlyViewed || {})[0] as any)?._id;
|
|
||||||
setNavigateToProject(firstId)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Error fetching recent projects:", error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
useEffect(() => {
|
|
||||||
fetchRecentProjects();
|
|
||||||
|
|
||||||
}, [navigateToProject]);
|
|
||||||
const handleLogin = async (e: FormEvent<HTMLFormElement>) => {
|
const handleLogin = async (e: FormEvent<HTMLFormElement>) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
const organization = email.split("@")[1].split(".")[0];
|
const organization = email.split("@")[1].split(".")[0];
|
||||||
|
@ -76,8 +58,7 @@ const UserAuth: React.FC = () => {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const projects = await recentlyViewed(organization, res.message.userId);
|
const projects = await recentlyViewed(organization, res.message.userId);
|
||||||
console.log("RecentlyViewed: ", Object.values(projects.RecentlyViewed)[0]
|
|
||||||
);
|
|
||||||
if (Object.values(projects.RecentlyViewed).length > 0) {
|
if (Object.values(projects.RecentlyViewed).length > 0) {
|
||||||
const firstId = (Object.values(projects?.RecentlyViewed || {})[0] as any)?._id;
|
const firstId = (Object.values(projects?.RecentlyViewed || {})[0] as any)?._id;
|
||||||
setLoadingProgress(1)
|
setLoadingProgress(1)
|
||||||
|
|
Loading…
Reference in New Issue