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

Merged in release/2024-12-13 (pull request #2022)

Browse Source 
IO-3020 IO-3036 Remove Audit and Lifecycle feature wraps.
This commit is contained in:
Patrick Fic
2024-12-13 16:28:53 +00:00
parent 608988c67c c9cd4c51e8
commit 4ec171d93b
9 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/components/feature-wrapper/blur-wrapper.component.jsx
View File

@@ -49,7 +49,9 @@ export function BlurWrapper({
}
if (bypass) {
console.trace("*** BYPASS USED", featureName);
if (import.meta.env.DEV) {
console.trace("*** Blur Wrapper BYPASS USED", featureName);
}
return children;
}
@@ -118,7 +120,7 @@ function RandomDate() {
const featureNameList = [
"mobile",
"allAccess",
"audit",
//"audit", //Removing 2024-12-13. Keeping as default feature.
"timetickets",
"payments",
"partsorders",
@@ -133,8 +135,8 @@ const featureNameList = [
"checklist",
"smartscheduling",
"roguard",
"dashboard",
"lifecycle"
"dashboard"
//"lifecycle" //Removing 2024-12-13. Keeping as default feature.
];
export function ValidateFeatureName(featureName) {

17
client/src/components/feature-wrapper/feature-wrapper.component.jsx
View File

@@ -19,9 +19,18 @@ function FeatureWrapper({
blurContent,
children,
upsellComponent,
bypass,
...restProps
}) {
const { t } = useTranslation();
if (bypass) {
if (import.meta.env.DEV) {
console.trace("*** Feature Wrapper BYPASS USED", featureName);
}
return children;
}
if (import.meta.env.DEV) {
if (!ValidateFeatureName(featureName)) console.trace("*** INVALID FEATURE NAME", featureName);
}
@@ -59,10 +68,16 @@ function FeatureWrapper({
}
}
export function HasFeatureAccess({ featureName, bodyshop, debug = false }) {
export function HasFeatureAccess({ featureName, bodyshop, bypass, debug = false }) {
if (debug) {
console.trace(`*** HasFeatureAccessFunction called with feature << ${featureName} >>`);
}
if (bypass) {
if (import.meta.env.DEV) {
console.trace("*** Feature Wrapper BYPASS USED", featureName);
}
return true;
}
return bodyshop?.features?.allAccess || dayjs(bodyshop?.features[featureName]).isAfter(dayjs());
}

10
client/src/components/job-audit-trail/job-audit-trail.component.jsx
View File

@@ -47,7 +47,7 @@ export function JobAuditTrail({ bodyshop, currentUser, jobId }) {
dataIndex: "operation",
key: "operation",
render: (text, record) => (
<BlurWrapperComponent featureName="audit">
<BlurWrapperComponent featureName="audit" bypass>
<div>{text}</div>
</BlurWrapperComponent>
)
@@ -77,7 +77,7 @@ export function JobAuditTrail({ bodyshop, currentUser, jobId }) {
record.to &&
record.to.map((email, idx) => (
<Tag key={idx}>
<BlurWrapperComponent featureName="audit">
<BlurWrapperComponent featureName="audit" bypass>
<div>{email}</div>
</BlurWrapperComponent>
</Tag>
@@ -92,7 +92,7 @@ export function JobAuditTrail({ bodyshop, currentUser, jobId }) {
record.cc &&
record.cc.map((email, idx) => (
<Tag key={idx}>
<BlurWrapperComponent featureName="audit">
<BlurWrapperComponent featureName="audit" bypass>
<div>{email}</div>
</BlurWrapperComponent>
</Tag>
@@ -103,7 +103,7 @@ export function JobAuditTrail({ bodyshop, currentUser, jobId }) {
dataIndex: "subject",
key: "subject",
render: (text, record) => (
<BlurWrapperComponent featureName="audit">
<BlurWrapperComponent featureName="audit" bypass>
<div>{text}</div>
</BlurWrapperComponent>
)
@@ -113,7 +113,7 @@ export function JobAuditTrail({ bodyshop, currentUser, jobId }) {
dataIndex: "status",
key: "status",
render: (text, record) => (
<BlurWrapperComponent featureName="audit">
<BlurWrapperComponent featureName="audit" bypass>
<div>{text}</div>
</BlurWrapperComponent>
)

14
client/src/components/job-lifecycle/job-lifecycle.component.jsx
View File

@@ -69,7 +69,12 @@ export function JobLifecycleComponent({ job, statuses, ...rest }) {
dataIndex: "value",
key: "value",
render: (text, record) => (
<BlurWrapperComponent featureName="lifecycle" valueProp="children" overrideValueFunction="RandomSmallString:2">
<BlurWrapperComponent
featureName="lifecycle"
bypass
valueProp="children"
overrideValueFunction="RandomSmallString:2"
>
<span>{text}</span>
</BlurWrapperComponent>
)
@@ -80,7 +85,7 @@ export function JobLifecycleComponent({ job, statuses, ...rest }) {
key: "start",
sorter: (a, b) => dayjs(a.start).unix() - dayjs(b.start).unix(),
render: (text, record) => (
<BlurWrapperComponent featureName="lifecycle" valueProp="children" overrideValueFunction="RandomDate">
<BlurWrapperComponent featureName="lifecycle" bypass valueProp="children" overrideValueFunction="RandomDate">
<span>{DateTimeFormatterFunction(text)}</span>
</BlurWrapperComponent>
)
@@ -105,7 +110,7 @@ export function JobLifecycleComponent({ job, statuses, ...rest }) {
},
render: (text, record) => (
<BlurWrapperComponent featureName="lifecycle" valueProp="children" overrideValueFunction="RandomDate">
<BlurWrapperComponent featureName="lifecycle" bypass valueProp="children" overrideValueFunction="RandomDate">
<span>{isEmpty(text) ? t("job_lifecycle.content.not_available") : DateTimeFormatterFunction(text)}</span>
</BlurWrapperComponent>
)
@@ -141,7 +146,7 @@ export function JobLifecycleComponent({ job, statuses, ...rest }) {
<Card type="inner" style={{ marginTop: "10px" }}>
<UpsellComponent upsell={upsellEnum().lifecycle.general} />
</Card>
<BlurWrapperComponent featureName="lifecycle">
<BlurWrapperComponent featureName="lifecycle" bypass>
<div
id="bar-container"
style={{
@@ -221,6 +226,7 @@ export function JobLifecycleComponent({ job, statuses, ...rest }) {
{key.status} (
<BlurWrapperComponent
featureName="lifecycle"
bypass
overrideValueFunction="RandomAmount"
valueProp="children"
>

8
client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx
View File

@@ -148,14 +148,6 @@ export function JobsDetailHeaderActionsToggleProduction({ bodyshop, job, jobRO,
<Button type="primary" onClick={() => form.submit()} loading={loading}>
{t("general.actions.save")}
</Button>
<Button
disabled={scenario === "post"}
onClick={() => {
// setOpen(false);
}}
>
{t("general.actions.close")}
</Button>
</Space>
</Form>
</div>

16
client/src/components/lock-wrapper/lock-wrapper.component.jsx
View File

@@ -14,10 +14,11 @@ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
});
const LockWrapper = ({ featureName, bodyshop, children, disabled = true }) => {
const LockWrapper = ({ featureName, bodyshop, children, disabled = true, bypass }) => {
let renderedChildren = children;
if (disabled) {
//Mark the child prop as disabled.
if (disabled && !bypass) {
renderedChildren = React.Children.map(children, (child) => {
if (React.isValidElement(child)) {
return React.cloneElement(child, {
@@ -28,7 +29,16 @@ const LockWrapper = ({ featureName, bodyshop, children, disabled = true }) => {
});
}
return (
if (bypass) {
if (import.meta.env.DEV) {
console.trace("*** Lock Wrapper BYPASS USED", featureName);
}
return <span>{children}</span>;
}
return HasFeatureAccess({ featureName: featureName, bodyshop }) ? (
children
) : (
<Space>
{!HasFeatureAccess({ featureName: featureName, bodyshop }) && <LockOutlined style={{ color: "tomato" }} />}
{renderedChildren}

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

@@ -1,3 +1,4 @@
import { useSplitTreatments } from "@splitsoftware/splitio-react";
import { Button, Card, Tabs } from "antd";
import React from "react";
@@ -94,7 +95,7 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
key: "checklists",
label: <LockWrapperComponent featureName="checklist">{t("bodyshop.labels.checklists")}</LockWrapperComponent>,
children: <ShopInfoIntakeChecklistComponent form={form} />,
disabled: HasFeatureAccess({ bodyshop, featureName: "checklist" }),
disabled: !HasFeatureAccess({ bodyshop, featureName: "checklist" }),
id: "tab-shop-checklists"
},
{

4
client/src/pages/jobs-detail/jobs-detail.page.component.jsx
View File

@@ -403,7 +403,7 @@ export function JobsDetailPage({
icon: <BarsOutlined />,
id: "job-details-lifecycle",
label: (
<LockWrapperComponent featureName="lifecycle">{t("menus.jobsdetail.lifecycle")}</LockWrapperComponent>
<LockWrapperComponent featureName="lifecycle" bypass>{t("menus.jobsdetail.lifecycle")}</LockWrapperComponent>
),
children: <JobLifecycleComponent job={job} statuses={bodyshop.md_ro_statuses} />
},
@@ -438,7 +438,7 @@ export function JobsDetailPage({
key: "audit",
icon: <HistoryOutlined />,
id: "job-details-audit",
label: <LockWrapperComponent featureName="audit">{t("jobs.labels.audit")}</LockWrapperComponent>,
label: <LockWrapperComponent featureName="audit" bypass>{t("jobs.labels.audit")}</LockWrapperComponent>,
children: <JobAuditTrail jobId={job.id} />
},
{

12
client/src/utils/TemplateConstants.js
View File

@@ -589,8 +589,8 @@ export const TemplateList = (type, context) => {
subject: i18n.t("printcenter.jobs.job_lifecycle_ro"),
key: "job_lifecycle_ro",
disabled: false,
group: "post",
featureNameRestricted: "lifecycle"
group: "post"
//featureNameRestricted: "lifecycle"
},
job_tasks: {
title: i18n.t("printcenter.jobs.job_tasks"),
@@ -2136,8 +2136,8 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced")
},
group: "jobs",
featureNameRestricted: "lifecycle"
group: "jobs"
//featureNameRestricted: "lifecycle"
},
job_lifecycle_date_summary: {
title: i18n.t("reportcenter.templates.job_lifecycle_date_summary"),
@@ -2149,8 +2149,8 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced")
},
group: "jobs",
featureNameRestricted: "lifecycle"
group: "jobs"
//featureNameRestricted: "lifecycle"
},
tasks_date: {
title: i18n.t("reportcenter.templates.tasks_date"),