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

Merged in feature/IO-3320-Responsibility-Center-RBAC (pull request #2446)

Browse Source 
IO-3320 Responsibility Center RBAC

Approved-by: Dave Richer
This commit is contained in:
Allan Carr
2025-07-31 19:51:38 +00:00
committed by Dave Richer
parent e2618eee83 27a07e8d5d
commit bb4e8eb5bd
6 changed files with 4751 additions and 4677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/components/rbac-wrapper/rbac-defaults.js
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,

207
client/src/components/shop-info/shop-info.rbac.component.jsx
View File

@@ -1,6 +1,5 @@
import { useSplitTreatments } from "@splitsoftware/splitio-react";
import { Form, InputNumber } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
@@ -12,12 +11,12 @@ import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
});
const mapDispatchToProps = (dispatch) => ({
const mapDispatchToProps = () => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoRbacComponent);
export function ShopInfoRbacComponent({ form, bodyshop }) {
export function ShopInfoRbacComponent({ bodyshop }) {
const { t } = useTranslation();
const {
treatments: { Simple_Inventory }
@@ -29,9 +28,11 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
return (
<RbacWrapper action="shop:rbac">
<LayoutFormRow>
{...HasFeatureAccess({ featureName: "export", bodyshop })
{[
...(HasFeatureAccess({ featureName: "export", bodyshop })
? [
<Form.Item
key="accounting:exportlog"
label={t("bodyshop.fields.rbac.accounting.exportlog")}
rules={[
{
@@ -44,6 +45,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="accounting:payables"
label={t("bodyshop.fields.rbac.accounting.payables")}
rules={[
{
@@ -56,6 +58,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="accounting:payments"
label={t("bodyshop.fields.rbac.accounting.payments")}
rules={[
{
@@ -68,6 +71,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="accounting:receivables"
label={t("bodyshop.fields.rbac.accounting.receivables")}
rules={[
{
@@ -80,10 +84,11 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>
]
: []}
{...HasFeatureAccess({ featureName: "bills", bodyshop })
: []),
...(HasFeatureAccess({ featureName: "bills", bodyshop })
? [
<Form.Item
key="bills:delete"
label={t("bodyshop.fields.rbac.bills.delete")}
rules={[
{
@@ -96,6 +101,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="bills:enter"
label={t("bodyshop.fields.rbac.bills.enter")}
rules={[
{
@@ -108,6 +114,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="bills:list"
label={t("bodyshop.fields.rbac.bills.list")}
rules={[
{
@@ -120,6 +127,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="bills:reexport"
label={t("bodyshop.fields.rbac.bills.reexport")}
rules={[
{
@@ -132,6 +140,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="bills:view"
label={t("bodyshop.fields.rbac.bills.view")}
rules={[
{
@@ -144,10 +153,11 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>
]
: []}
{...HasFeatureAccess({ featureName: "courtesycars", bodyshop })
: []),
...(HasFeatureAccess({ featureName: "courtesycars", bodyshop })
? [
<Form.Item
key="contracts:create"
label={t("bodyshop.fields.rbac.contracts.create")}
rules={[
{
@@ -160,6 +170,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="contracts:detail"
label={t("bodyshop.fields.rbac.contracts.detail")}
rules={[
{
@@ -172,6 +183,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="contracts:list"
label={t("bodyshop.fields.rbac.contracts.list")}
rules={[
{
@@ -184,6 +196,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="courtesycar:create"
label={t("bodyshop.fields.rbac.courtesycar.create")}
rules={[
{
@@ -196,6 +209,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="courtesycar:detail"
label={t("bodyshop.fields.rbac.courtesycar.detail")}
rules={[
{
@@ -208,6 +222,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="courtesycar:list"
label={t("bodyshop.fields.rbac.courtesycar.list")}
rules={[
{
@@ -220,10 +235,11 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>
]
: []}
{...HasFeatureAccess({ featureName: "csi", bodyshop })
: []),
...(HasFeatureAccess({ featureName: "csi", bodyshop })
? [
<Form.Item
key="csi:export"
label={t("bodyshop.fields.rbac.csi.export")}
rules={[
{
@@ -236,6 +252,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="csi:page"
label={t("bodyshop.fields.rbac.csi.page")}
rules={[
{
@@ -248,8 +265,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>
]
: []}
: []),
<Form.Item
key="employees:page"
label={t("bodyshop.fields.rbac.employees.page")}
rules={[
{
@@ -260,8 +278,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "employees:page"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="employee_teams:page"
label={t("bodyshop.fields.rbac.employee_teams.page")}
rules={[
{
@@ -272,8 +291,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "employee_teams:page"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="jobs:admin"
label={t("bodyshop.fields.rbac.jobs.admin")}
rules={[
{
@@ -284,8 +304,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "jobs:admin"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="jobs:available-list"
label={t("bodyshop.fields.rbac.jobs.available-list")}
rules={[
{
@@ -296,8 +317,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "jobs:available-list"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="jobs:checklist-view"
label={t("bodyshop.fields.rbac.jobs.checklist-view")}
rules={[
{
@@ -308,8 +330,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "jobs:checklist-view"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="jobs:close"
label={t("bodyshop.fields.rbac.jobs.close")}
rules={[
{
@@ -320,8 +343,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "jobs:close"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="jobs:create"
label={t("bodyshop.fields.rbac.jobs.create")}
rules={[
{
@@ -332,8 +356,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "jobs:create"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="jobs:deliver"
label={t("bodyshop.fields.rbac.jobs.deliver")}
rules={[
{
@@ -344,8 +369,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "jobs:deliver"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="jobs:detail"
label={t("bodyshop.fields.rbac.jobs.detail")}
rules={[
{
@@ -356,8 +382,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "jobs:detail"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="jobs:intake"
label={t("bodyshop.fields.rbac.jobs.intake")}
rules={[
{
@@ -368,8 +395,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "jobs:intake"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="jobs:list-active"
label={t("bodyshop.fields.rbac.jobs.list-active")}
rules={[
{
@@ -380,8 +408,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "jobs:list-active"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="jobs:list-all"
label={t("bodyshop.fields.rbac.jobs.list-all")}
rules={[
{
@@ -392,8 +421,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "jobs:list-all"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="jobs:list-ready"
label={t("bodyshop.fields.rbac.jobs.list-ready")}
rules={[
{
@@ -404,8 +434,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "jobs:list-ready"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="jobs:partsqueue"
label={t("bodyshop.fields.rbac.jobs.partsqueue")}
rules={[
{
@@ -416,8 +447,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "jobs:partsqueue"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="jobs:void"
label={t("bodyshop.fields.rbac.jobs.void")}
rules={[
{
@@ -428,8 +460,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "jobs:void"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="owners:detail"
label={t("bodyshop.fields.rbac.owners.detail")}
rules={[
{
@@ -440,8 +473,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "owners:detail"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="owners:list"
label={t("bodyshop.fields.rbac.owners.list")}
rules={[
{
@@ -452,8 +486,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "owners:list"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="payments:enter"
label={t("bodyshop.fields.rbac.payments.enter")}
rules={[
{
@@ -464,8 +499,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "payments:enter"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="payments:list"
label={t("bodyshop.fields.rbac.payments.list")}
rules={[
{
@@ -476,8 +512,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "payments:list"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="phonebook:edit"
label={t("bodyshop.fields.rbac.phonebook.edit")}
rules={[
{
@@ -488,8 +525,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "phonebook:edit"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="phonebook:view"
label={t("bodyshop.fields.rbac.phonebook.view")}
rules={[
{
@@ -500,9 +538,11 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "phonebook:view"]}
>
<InputNumber />
</Form.Item>
{HasFeatureAccess({ featureName: "visualboard", bodyshop }) && (
</Form.Item>,
...(HasFeatureAccess({ featureName: "visualboard", bodyshop })
? [
<Form.Item
key="production:board"
label={t("bodyshop.fields.rbac.production.board")}
rules={[
{
@@ -514,8 +554,10 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
>
<InputNumber />
</Form.Item>
)}
]
: []),
<Form.Item
key="production:list"
label={t("bodyshop.fields.rbac.production.list")}
rules={[
{
@@ -526,8 +568,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "production:list"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="schedule:view"
label={t("bodyshop.fields.rbac.schedule.view")}
rules={[
{
@@ -538,9 +581,11 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "schedule:view"]}
>
<InputNumber />
</Form.Item>
{HasFeatureAccess({ featureName: "scoreboard", bodyshop }) && (
</Form.Item>,
...(HasFeatureAccess({ featureName: "scoreboard", bodyshop })
? [
<Form.Item
key="scoreboard:view"
label={t("bodyshop.fields.rbac.scoreboard.view")}
rules={[
{
@@ -552,10 +597,12 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
>
<InputNumber />
</Form.Item>
)}
{...HasFeatureAccess({ featureName: "timetickets", bodyshop })
]
: []),
...(HasFeatureAccess({ featureName: "timetickets", bodyshop })
? [
<Form.Item
key="shiftclock:view"
label={t("bodyshop.fields.rbac.shiftclock.view")}
rules={[
{
@@ -568,18 +615,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.shop.config")}
rules={[
{
required: true
//message: t("general.validation.required"),
}
]}
name={["md_rbac", "shop:config"]}
>
<InputNumber />
</Form.Item>,
<Form.Item
key="timetickets:edit"
label={t("bodyshop.fields.rbac.timetickets.edit")}
rules={[
{
@@ -592,6 +628,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="timetickets:shiftedit"
label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
rules={[
{
@@ -604,6 +641,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="timetickets:editcommitted"
label={t("bodyshop.fields.rbac.timetickets.editcommitted")}
rules={[
{
@@ -616,6 +654,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="ttapprovals:view"
label={t("bodyshop.fields.rbac.ttapprovals.view")}
rules={[
{
@@ -628,6 +667,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="ttapprovals:approve"
label={t("bodyshop.fields.rbac.ttapprovals.approve")}
rules={[
{
@@ -640,6 +680,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="timetickets:enter"
label={t("bodyshop.fields.rbac.timetickets.enter")}
rules={[
{
@@ -652,6 +693,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>,
<Form.Item
key="timetickets:list"
label={t("bodyshop.fields.rbac.timetickets.list")}
rules={[
{
@@ -664,20 +706,22 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>
]
: []}
: []),
<Form.Item
label={t("bodyshop.fields.rbac.shop.vendors")}
key="shop:config"
label={t("bodyshop.fields.rbac.shop.config")}
rules={[
{
required: true
//message: t("general.validation.required"),
}
]}
name={["md_rbac", "shop:vendors"]}
name={["md_rbac", "shop:config"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="shop:dashboard"
label={t("bodyshop.fields.rbac.shop.dashboard")}
rules={[
{
@@ -688,8 +732,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "shop:dashboard"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="shop:rbac"
label={t("bodyshop.fields.rbac.shop.rbac")}
rules={[
{
@@ -700,8 +745,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "shop:rbac"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="shop:reportcenter"
label={t("bodyshop.fields.rbac.shop.reportcenter")}
rules={[
{
@@ -712,21 +758,37 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "shop:reportcenter"]}
>
<InputNumber />
</Form.Item>
{/* <Form.Item
label={t("bodyshop.fields.rbac.shop.templates")}
</Form.Item>,
<Form.Item
key="shop:responsibilitycenter"
label={t("bodyshop.fields.rbac.shop.responsibilitycenter")}
rules={[
{
required: true
//message: t("general.validation.required"),
}
]}
name={["md_rbac", "shop:templates"]}
name={["md_rbac", "shop:responsibilitycenter"]}
>
<InputNumber />
</Form.Item> */}
{HasFeatureAccess({ featureName: "media", bodyshop }) && (
</Form.Item>,
<Form.Item
key="shop:vendors"
label={t("bodyshop.fields.rbac.shop.vendors")}
rules={[
{
required: true
//message: t("general.validation.required"),
}
]}
name={["md_rbac", "shop:vendors"]}
>
<InputNumber />
</Form.Item>,
...(HasFeatureAccess({ featureName: "media", bodyshop })
? [
<Form.Item
key="temporarydocs:view"
label={t("bodyshop.fields.rbac.temporarydocs.view")}
rules={[
{
@@ -738,8 +800,10 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
>
<InputNumber />
</Form.Item>
)}
]
: []),
<Form.Item
key="users:editaccess"
label={t("bodyshop.fields.rbac.users.editaccess")}
rules={[
{
@@ -750,10 +814,11 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "users:editaccess"]}
>
<InputNumber />
</Form.Item>
{Simple_Inventory.treatment === "on" && (
<>
</Form.Item>,
...(Simple_Inventory.treatment === "on"
? [
<Form.Item
key="inventory:list"
label={t("bodyshop.fields.rbac.inventory.list")}
rules={[
{
@@ -764,8 +829,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "inventory:list"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
key="inventory:delete"
label={t("bodyshop.fields.rbac.inventory.delete")}
rules={[
{
@@ -777,8 +843,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
>
<InputNumber />
</Form.Item>
</>
)}
]
: [])
]}
</LayoutFormRow>
</RbacWrapper>
);

3
client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
View File

@@ -12,6 +12,7 @@ import DataLabel from "../data-label/data-label.component";
import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
import ShopInfoResponsibilitycentersTaxesComponent from "./shop-info.responsibilitycenters.taxes.component";
const SelectorDiv = styled.div`
@@ -59,6 +60,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
return (
<div>
<RbacWrapper action="shop:responsibilitycenter">
{(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
<>
{bodyshop.cdk_dealerid && (
@@ -4492,6 +4494,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
</LayoutFormRow>
</>
)}
</RbacWrapper>
</div>
);
}

1
client/src/translations/en_us/common.json
View File

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

1
client/src/translations/es/common.json
View File

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

1
client/src/translations/fr/common.json
View File

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