Compare commits

..

1 Commits

Author SHA1 Message Date
Allan Carr
27a07e8d5d IO-3320 Responsibility Center RBAC
Signed-off-by: Allan Carr <allan@imexsystems.ca>
2025-07-31 12:49:56 -07:00
7 changed files with 4771 additions and 4682 deletions

View File

@@ -1,16 +1,16 @@
import { DownCircleFilled } from "@ant-design/icons";
import { useMutation } from "@apollo/client";
import { Button, Dropdown } from "antd";
import { useEffect, useState } from "react";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
import { insertAuditTrail } from "../../redux/application/application.actions";
import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { selectBodyshop } from "../../redux/user/user.selectors";
import AuditTrailMapping from "../../utils/AuditTrailMappings";
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
@@ -24,6 +24,7 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
const { t } = useTranslation();
const [availableStatuses, setAvailableStatuses] = useState([]);
const [otherStages, setOtherStages] = useState([]);
const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
const notification = useNotification();
@@ -31,7 +32,7 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
mutationUpdateJobstatus({
variables: { jobId: job.id, status: status }
})
.then(() => {
.then((r) => {
notification["success"]({ message: t("jobs.successes.save") });
insertAuditTrail({
jobid: job.id,
@@ -40,7 +41,7 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
});
// refetch();
})
.catch(() => {
.catch((error) => {
notification["error"]({ message: t("jobs.errors.saving") });
});
};
@@ -50,14 +51,19 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
if (job && bodyshop) {
if (bodyshop.md_ro_statuses.pre_production_statuses.includes(job.status)) {
setAvailableStatuses(bodyshop.md_ro_statuses.pre_production_statuses);
if (bodyshop.md_ro_statuses.production_statuses[0])
setOtherStages([bodyshop.md_ro_statuses.production_statuses[0]]);
} else if (bodyshop.md_ro_statuses.production_statuses.includes(job.status)) {
setAvailableStatuses(bodyshop.md_ro_statuses.production_statuses);
setOtherStages([bodyshop.md_ro_statuses.default_imported, bodyshop.md_ro_statuses.default_delivered]);
} else if (bodyshop.md_ro_statuses.post_production_statuses.includes(job.status)) {
setAvailableStatuses(
bodyshop.md_ro_statuses.post_production_statuses.filter(
(s) => s !== bodyshop.md_ro_statuses.default_invoiced && s !== bodyshop.md_ro_statuses.default_exported
)
);
if (bodyshop.md_ro_statuses.production_statuses[0])
setOtherStages([bodyshop.md_ro_statuses.production_statuses[0]]);
} else {
console.log("Status didn't match any restrictions. Allowing all status changes.");
setAvailableStatuses(bodyshop.md_ro_statuses.statuses);
@@ -70,7 +76,16 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
...availableStatuses.map((item) => ({
key: item,
label: item
}))
})),
...(job.converted
? [
{ type: "divider" },
...otherStages.map((item) => ({
key: item,
label: item
}))
]
: [])
],
onClick: (e) => updateJobStatus(e.key)
};

View File

@@ -59,6 +59,7 @@ const ret = {
"shop:dashboard": 3,
"shop:rbac": 5,
"shop:reportcenter": 2,
"shop:responsibilitycenter": 4, // Updated from "shop:responsibility" to "shop:responsibilitycenter"
"shop:templates": 4,
"shop:vendors": 2,

File diff suppressed because it is too large Load Diff

View File

@@ -512,6 +512,7 @@
"dashboard": "Shop -> Dashboard",
"rbac": "Shop -> RBAC",
"reportcenter": "Shop -> Report Center",
"responsibilitycenter": "Shop -> Responsibility Centers",
"templates": "Shop -> Templates",
"vendors": "Shop -> Vendors"
},

View File

@@ -512,6 +512,7 @@
"dashboard": "",
"rbac": "",
"reportcenter": "",
"responsibilitycenter": "",
"templates": "",
"vendors": ""
},

View File

@@ -512,6 +512,7 @@
"dashboard": "",
"rbac": "",
"reportcenter": "",
"responsibilitycenter": "",
"templates": "",
"vendors": ""
},