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

Merge branch 'release/AIO/2024-05-10' into test-AIO

Browse Source
This commit is contained in:
Patrick Fic
2024-05-10 08:33:31 -07:00
parent c70447f337 51d1f926c2
commit 992ad71910
2 changed files with 334 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/jobs-list/jobs-list.component.jsx
View File

@@ -18,8 +18,6 @@ import ChatOpenButton from "../chat-open-button/chat-open-button.component";
import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
import { setJoyRideSteps } from "../../redux/application/application.actions";
import { OwnerNameDisplayFunction } from "./../owner-name-display/owner-name-display.component";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
});

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

@@ -30,8 +30,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
return (
<RbacWrapper action="shop:rbac">
<LayoutFormRow>
{HasFeatureAccess({ featureName: "export", bodyshop }) && (
<>
{...HasFeatureAccess({ featureName: "export", bodyshop }) && [
<Form.Item
label={t("bodyshop.fields.rbac.accounting.exportlog")}
rules={[
@@ -43,7 +42,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "accounting:exportlog"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.accounting.payables")}
rules={[
@@ -55,7 +54,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "accounting:payables"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.accounting.payments")}
rules={[
@@ -67,7 +66,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "accounting:payments"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.accounting.receivables")}
rules={[
@@ -80,10 +79,8 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
>
<InputNumber />
</Form.Item>
</>
)}
{HasFeatureAccess({ featureName: "bills", bodyshop }) && (
<>
]}
{...HasFeatureAccess({ featureName: "bills", bodyshop }) && [
<Form.Item
label={t("bodyshop.fields.rbac.bills.delete")}
rules={[
@@ -95,7 +92,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "bills:delete"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.bills.enter")}
rules={[
@@ -107,7 +104,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "bills:enter"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.bills.list")}
rules={[
@@ -119,7 +116,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "bills:list"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.bills.reexport")}
rules={[
@@ -131,7 +128,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "bills:reexport"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.bills.view")}
rules={[
@@ -144,11 +141,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
>
<InputNumber />
</Form.Item>
</>
)}
]}
{HasFeatureAccess({ featureName: "courtesycars", bodyshop }) && (
<>
{...HasFeatureAccess({ featureName: "courtesycars", bodyshop }) && [
<Form.Item
label={t("bodyshop.fields.rbac.contracts.create")}
rules={[
@@ -160,7 +155,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "contracts:create"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.contracts.detail")}
rules={[
@@ -172,7 +167,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "contracts:detail"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.contracts.list")}
rules={[
@@ -184,7 +179,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "contracts:list"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.courtesycar.create")}
rules={[
@@ -196,7 +191,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "courtesycar:create"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.courtesycar.detail")}
rules={[
@@ -208,7 +203,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "courtesycar:detail"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.courtesycar.list")}
rules={[
@@ -221,10 +216,8 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
>
<InputNumber />
</Form.Item>
</>
)}
{HasFeatureAccess({ featureName: "csi", bodyshop }) && (
<>
]}
{...HasFeatureAccess({ featureName: "csi", bodyshop }) && [
<Form.Item
label={t("bodyshop.fields.rbac.csi.export")}
rules={[
@@ -236,7 +229,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "csi:export"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.csi.page")}
rules={[
@@ -249,8 +242,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
>
<InputNumber />
</Form.Item>
</>
)}
]}
<Form.Item
label={t("bodyshop.fields.rbac.employees.page")}
rules={[
@@ -569,8 +561,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
<InputNumber />
</Form.Item>
)}
{HasFeatureAccess({ featureName: "timetickets", bodyshop }) && (
<>
{...HasFeatureAccess({ featureName: "timetickets", bodyshop }) && [
<Form.Item
label={t("bodyshop.fields.rbac.shiftclock.view")}
rules={[
@@ -582,7 +573,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "shiftclock:view"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.shop.config")}
rules={[
@@ -594,7 +585,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "shop:config"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.timetickets.edit")}
rules={[
@@ -606,7 +597,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "timetickets:edit"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
rules={[
@@ -618,7 +609,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "timetickets:shiftedit"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.timetickets.editcommitted")}
rules={[
@@ -630,7 +621,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "timetickets:editcommitted"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.ttapprovals.view")}
rules={[
@@ -642,7 +633,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "ttapprovals:view"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.ttapprovals.approve")}
rules={[
@@ -654,7 +645,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "ttapprovals:approve"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.timetickets.enter")}
rules={[
@@ -666,7 +657,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "timetickets:enter"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.timetickets.list")}
rules={[
@@ -678,7 +669,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
name={["md_rbac", "timetickets:list"]}
>
<InputNumber />
</Form.Item>
</Form.Item>,
<Form.Item
label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
rules={[
@@ -691,8 +682,7 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
>
<InputNumber />
</Form.Item>
</>
)}
]}
<Form.Item
label={t("bodyshop.fields.rbac.shop.vendors")}
rules={[