admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Formatting issues

Browse Source 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-04-08 22:25:07 -04:00
parent df0f8ef9dc
commit 33c282051b
34 changed files with 1805 additions and 1820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
client/src/pages/tasks/allTasksPageContainer.jsx
View File

@@ -1,75 +1,70 @@
import React, {useEffect} from "react";
import {useTranslation} from "react-i18next";
import React, { useEffect } from "react";
import { useTranslation } from "react-i18next";
import TasksPageComponent from "./tasks.page.component";
import queryString from "query-string";
import {connect} from "react-redux";
import {createStructuredSelector} from "reselect";
import {setBreadcrumbs, setSelectedHeader} from "../../redux/application/application.actions";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
import {selectBodyshop, selectCurrentUser} from "../../redux/user/user.selectors.js";
import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js";
import TaskPageTypes from "./taskPageTypes.jsx";
import {setModalContext} from "../../redux/modals/modals.actions.js";
import {useLocation} from "react-router-dom";
import { setModalContext } from "../../redux/modals/modals.actions.js";
import { useLocation } from "react-router-dom";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
currentUser: selectCurrentUser,
currentUser: selectCurrentUser
});
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
setTaskUpsertContext: (context) => dispatch(setModalContext({context, modal: 'taskUpsert'})),
setTaskUpsertContext: (context) => dispatch(setModalContext({ context, modal: "taskUpsert" }))
});
export function MyTasksPageContainer({
bodyshop,
currentUser,
setBreadcrumbs,
setSelectedHeader,
setTaskUpsertContext
}) {
const {t} = useTranslation();
const searchParams = queryString.parse((useLocation().search));
bodyshop,
currentUser,
setBreadcrumbs,
setSelectedHeader,
setTaskUpsertContext
}) {
const { t } = useTranslation();
const searchParams = queryString.parse(useLocation().search);
useEffect(() => {
document.title = t("titles.all_tasks", {
app: InstanceRenderManager({
imex: '$t(titles.imexonline)',
rome: '$t(titles.romeonline)',
promanager: '$t(titles.promanager)'
imex: "$t(titles.imexonline)",
rome: "$t(titles.romeonline)",
promanager: "$t(titles.promanager)"
})
});
setSelectedHeader("all_tasks");
setBreadcrumbs([
{
link: "/manage/tasks/alltasks",
label: t("titles.bc.all_tasks"),
},]);
label: t("titles.bc.all_tasks")
}
]);
}, [t, setBreadcrumbs, setSelectedHeader]);
// This takes care of the ability to deep link a task from the URL (Dispatches the modal)
useEffect(() => {
// Check for a query string in the URL
const urlParams = new URLSearchParams(searchParams);
const taskId = urlParams.get('taskid');
const taskId = urlParams.get("taskid");
if (taskId) {
setTaskUpsertContext({
context: {
taskId,
},
taskId
}
});
urlParams.delete('taskid');
urlParams.delete("taskid");
}
}, [setTaskUpsertContext]);
return (
<TasksPageComponent type={TaskPageTypes.ALL_TASKS} currentUser={currentUser}
bodyshop={bodyshop}/>
);
return <TasksPageComponent type={TaskPageTypes.ALL_TASKS} currentUser={currentUser} bodyshop={bodyshop} />;
}
export default connect(
mapStateToProps,
mapDispatchToProps
)(MyTasksPageContainer);
export default connect(mapStateToProps, mapDispatchToProps)(MyTasksPageContainer);

41
client/src/pages/tasks/myTasksPageContainer.jsx
View File

@@ -1,49 +1,44 @@
import React, {useEffect} from "react";
import {useTranslation} from "react-i18next";
import React, { useEffect } from "react";
import { useTranslation } from "react-i18next";
import TasksPageComponent from "./tasks.page.component";
import {connect} from "react-redux";
import {createStructuredSelector} from "reselect";
import {setBreadcrumbs, setSelectedHeader} from "../../redux/application/application.actions";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
import {selectBodyshop, selectCurrentUser} from "../../redux/user/user.selectors.js";
import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js";
import TaskPageTypes from "./taskPageTypes.jsx";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
currentUser: selectCurrentUser,
currentUser: selectCurrentUser
});
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
});
export function MyTasksPageContainer({bodyshop, currentUser, setBreadcrumbs, setSelectedHeader}) {
const {t} = useTranslation();
export function MyTasksPageContainer({ bodyshop, currentUser, setBreadcrumbs, setSelectedHeader }) {
const { t } = useTranslation();
useEffect(() => {
document.title = t("titles.my_tasks", {
app: InstanceRenderManager({
imex: '$t(titles.imexonline)',
rome: '$t(titles.romeonline)',
promanager: '$t(titles.promanager)'
imex: "$t(titles.imexonline)",
rome: "$t(titles.romeonline)",
promanager: "$t(titles.promanager)"
})
});
setSelectedHeader("my_tasks");
setBreadcrumbs([
{
link: "/manage/tasks/mytasks",
label: t("titles.bc.my_tasks"),
},]);
label: t("titles.bc.my_tasks")
}
]);
}, [t, setBreadcrumbs, setSelectedHeader]);
return (
<TasksPageComponent type={TaskPageTypes.MY_TASKS} currentUser={currentUser}
bodyshop={bodyshop}/>
);
return <TasksPageComponent type={TaskPageTypes.MY_TASKS} currentUser={currentUser} bodyshop={bodyshop} />;
}
export default connect(
mapStateToProps,
mapDispatchToProps
)(MyTasksPageContainer);
export default connect(mapStateToProps, mapDispatchToProps)(MyTasksPageContainer);

4
client/src/pages/tasks/taskPageTypes.jsx
View File

@@ -1,6 +1,6 @@
export const TaskPageTypes = {
MY_TASKS: 'myTasks',
ALL_TASKS: 'allTasks',
MY_TASKS: "myTasks",
ALL_TASKS: "allTasks"
};
export default TaskPageTypes;

33
client/src/pages/tasks/tasks.page.component.jsx
View File

@@ -1,21 +1,32 @@
import React from "react";
import TaskListContainer from "../../components/task-list/task-list.container.jsx";
import {QUERY_ALL_TASKS_PAGINATED, QUERY_MY_TASKS_PAGINATED} from "../../graphql/tasks.queries.js";
import { QUERY_ALL_TASKS_PAGINATED, QUERY_MY_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
import taskPageTypes from "./taskPageTypes.jsx";
export default function TasksPageComponent({bodyshop, currentUser, type}) {
export default function TasksPageComponent({ bodyshop, currentUser, type }) {
switch (type) {
case taskPageTypes.MY_TASKS:
return <TaskListContainer onlyMine={true} relationshipId={currentUser.email}
relationshipType={'user'} query={QUERY_MY_TASKS_PAGINATED}
bodyshop={bodyshop} titleTranslation={'tasks.titles.my_tasks'}
currentUser={currentUser}/>
return (
<TaskListContainer
onlyMine={true}
relationshipId={currentUser.email}
relationshipType={"user"}
query={QUERY_MY_TASKS_PAGINATED}
bodyshop={bodyshop}
titleTranslation={"tasks.titles.my_tasks"}
currentUser={currentUser}
/>
);
case taskPageTypes.ALL_TASKS:
return <TaskListContainer query={QUERY_ALL_TASKS_PAGINATED} bodyshop={bodyshop}
titleTranslation={'tasks.titles.all_tasks'}
currentUser={currentUser}/>
return (
<TaskListContainer
query={QUERY_ALL_TASKS_PAGINATED}
bodyshop={bodyshop}
titleTranslation={"tasks.titles.all_tasks"}
currentUser={currentUser}
/>
);
default:
return <></>
return <></>;
}
}