@olenbetong/synergi-react 2.3.2 → 2.3.3

package/es/elements/ElementDamage/DuplicateDamage/index.js

@@ -36,5 +36,8 @@ export const DuplicateElementDamage = forwardRef(function DuplicateElementDamage
         checkDuplicate: () => runDuplicateCheck(),
         record: record,
     }));
-    return (_jsx(DuplicateElementDamageDialog, { open: open, onClose: () => handleOpenChange(false), record: record, onRegisterAnyway: onRegisterAnyway ?? (() => { }), loading: loading ?? false, linkToDamage: linkToDamage }));
+    return (_jsx(DuplicateElementDamageDialog, { open: open, onClose: () => {
+            setRecord([]);
+            handleOpenChange(false);
+        }, record: record, onRegisterAnyway: onRegisterAnyway ?? (() => { }), loading: loading ?? false, linkToDamage: linkToDamage }));
 });

package/es/elements/ElementLookup.js

@@ -31,7 +31,7 @@ export function ElementLookup({ value, defaultValue, ref, elementIDRequired = fa
     useEffect(() => {
         onDialogChange?.(openElementLookupDialog);
     }, [openElementLookupDialog]);
-    return (_jsxs(_Fragment, { children: [_jsx(ElementLookupDialog, { open: openElementLookupDialog, mode: "single", onClose: () => setOpenElementLookupDialog(false), onAdd: handleAddElement, allowEmptyElement: true }), _jsx("input", { type: "hidden", name: "ProjectID", value: elementValue?.ProjectID ?? "" }), _jsx("input", { type: "hidden", name: "ElementRef", value: elementValue?.PrimKey ?? "" }), _jsx(TextField, { id: "NewElementDamge_Project", value: elementValue ? `${elementValue.ProjectID}: ${elementValue.ProjectName}` : "", label: getLocalizedString("Project"), fullWidth: true, required: true, autoComplete: "off", slotProps: { htmlInput: { readOnly: true } } }), _jsx(TextField, { name: "ElementID", id: "NewElementDamage_ElementID", value: elementValue ? elementValue.ElementID : "", label: getLocalizedString("Element ID"), fullWidth: true, required: elementIDRequired, autoComplete: "off", slotProps: {
+    return (_jsxs(_Fragment, { children: [_jsx(ElementLookupDialog, { open: openElementLookupDialog, mode: "single", onClose: () => setOpenElementLookupDialog(false), onAdd: handleAddElement, allowEmptyElement: !elementIDRequired }), _jsx("input", { type: "hidden", name: "ProjectID", value: elementValue?.ProjectID ?? "" }), _jsx("input", { type: "hidden", name: "ElementRef", value: elementValue?.PrimKey ?? "" }), _jsx(TextField, { id: "NewElementDamge_Project", value: elementValue ? `${elementValue.ProjectID}: ${elementValue.ProjectName}` : "", label: getLocalizedString("Project"), fullWidth: true, required: true, autoComplete: "off", slotProps: { htmlInput: { readOnly: true } } }), _jsx(TextField, { name: "ElementID", id: "NewElementDamage_ElementID", value: elementValue ? elementValue.ElementID : "", label: getLocalizedString("Element ID"), fullWidth: true, required: elementIDRequired, autoComplete: "off", slotProps: {
                     htmlInput: { readOnly: true },
                     input: {
                         endAdornment: openLookupDialogIcon ? (_jsx(IconButton, { onClick: () => setOpenElementLookupDialog(true), children: _jsx(SearchIcon, {}) })) : undefined,

package/es/elements/ElementLookupDialog/Manual/ManualForm.js

@@ -5,7 +5,7 @@ import { getLocalizedString } from "@olenbetong/appframe-core";
 import { useId, useRef, useState } from "react";
 import { ProjectSelect } from "../../ProjectSelect";
 import { getElement } from "../getElement";
-// const isElementsOnly = /^([a-z]{2,4}[\s]*[0-9]{4,8}[\s,]*)+$/i;
+const isElementsOnly = /^([a-z]{2,4}[\s]*[0-9]{4,8}[\s,]*)+$/i;
 const matchElements = /([a-z]{2,4}[\s]*[0-9]{4,8})/gi;
 export function AddElementManualForm({ onAdd, mode, defaultProject, allowEmptyElement = false, }) {
     let id = useId();
@@ -67,7 +67,5 @@ export function AddElementManualForm({ onAdd, mode, defaultProject, allowEmptyEl
             alert(error.message);
         }
     }
-    return (_jsxs("form", { id: id, onSubmit: handleSubmit, method: "post", children: [_jsx(Alert, { severity: "warning", sx: { mb: 2 }, children: getLocalizedString("Manually entering elements is a major source of errors. Only use this as a last resort. If the camera or scanner is not working, please contact the IT department.") }), _jsx("input", { type: "hidden", name: "Project", value: project ? JSON.stringify(project) : "" }), _jsx(ProjectSelect, { onChange: (project) => (project ? setProject(project) : setProject(null)), value: project, id: "AddElement_Project" }), _jsx(TextField, { variant: "filled", fullWidth: true, autoComplete: "off", margin: "normal", name: "ElementID", id: "AddElement_ElementID", label: getLocalizedString("Element ID"), value: elementId, onChange: (evt) => setElementId(evt.target.value) }), _jsx(Button, { form: id, ref: buttonRef, color: "primary", variant: "contained", size: "large", type: "submit", 
-                // disabled={!isElementsOnly.test(elementId) || working}
-                disabled: working, loading: working, loadingPosition: "end", endIcon: _jsx(Add, {}), children: getLocalizedString("Add") })] }));
+    return (_jsxs("form", { id: id, onSubmit: handleSubmit, method: "post", children: [_jsx(Alert, { severity: "warning", sx: { mb: 2 }, children: getLocalizedString("Manually entering elements is a major source of errors. Only use this as a last resort. If the camera or scanner is not working, please contact the IT department.") }), _jsx("input", { type: "hidden", name: "Project", value: project ? JSON.stringify(project) : "" }), _jsx(ProjectSelect, { onChange: (project) => (project ? setProject(project) : setProject(null)), value: project, id: "AddElement_Project" }), _jsx(TextField, { variant: "filled", fullWidth: true, autoComplete: "off", margin: "normal", name: "ElementID", id: "AddElement_ElementID", label: getLocalizedString("Element ID"), value: elementId, onChange: (evt) => setElementId(evt.target.value) }), _jsx(Button, { form: id, ref: buttonRef, color: "primary", variant: "contained", size: "large", type: "submit", disabled: (!allowEmptyElement && !isElementsOnly.test(elementId)) || working, loading: working, loadingPosition: "end", endIcon: _jsx(Add, {}), children: getLocalizedString("Add") })] }));
 }

package/es/elements/index.d.ts

@@ -7,3 +7,4 @@ export * from "./ElementDamage/RegisterFix.js";
 export * from "./ElementDamage/SubmitButtons.js";
 export * from "./ElementLookup.js";
 export * from "./ElementLookupDialog/index.js";
+export * from "./ProjectSelect.js";

package/es/elements/index.js

@@ -7,3 +7,4 @@ export * from "./ElementDamage/RegisterFix.js";
 export * from "./ElementDamage/SubmitButtons.js";
 export * from "./ElementLookup.js";
 export * from "./ElementLookupDialog/index.js";
+export * from "./ProjectSelect.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/synergi-react",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "Standalone React component for SynergiWeb and Partner Portal",
   "type": "module",
   "exports": {
@@ -38,7 +38,9 @@
     "filepond-plugin-image-transform": "^3.8.7",
     "localforage": "^1.10.0",
     "mitt": "^3.0.1",
-    "@olenbetong/appframe-core": "2.11.10"
+    "@olenbetong/appframe-core": "2.11.10",
+    "@olenbetong/appframe-mui": "6.0.7",
+    "@olenbetong/appframe-react": "1.21.21"
   },
   "repository": {
     "type": "git",

package/src/elements/ElementDamage/DuplicateDamage/index.tsx

@@ -100,7 +100,10 @@ export const DuplicateElementDamage = forwardRef<DuplicateElementDamageHandle, D
 		return (
 			<DuplicateElementDamageDialog
 				open={open}
-				onClose={() => handleOpenChange(false)}
+				onClose={() => {
+					setRecord([]);
+					handleOpenChange(false);
+				}}
 				record={record}
 				onRegisterAnyway={onRegisterAnyway ?? (() => {})}
 				loading={loading ?? false}

package/src/elements/ElementLookup.tsx

@@ -76,7 +76,7 @@ export function ElementLookup({
 				mode="single"
 				onClose={() => setOpenElementLookupDialog(false)}
 				onAdd={handleAddElement}
-				allowEmptyElement={true}
+				allowEmptyElement={!elementIDRequired}
 			/>
 
 			<input type="hidden" name="ProjectID" value={elementValue?.ProjectID ?? ""} />

package/src/elements/ElementLookupDialog/Manual/ManualForm.tsx

@@ -6,7 +6,7 @@ import type { ProjectsRecord } from "../../data/dsProjects";
 import { ProjectSelect } from "../../ProjectSelect";
 import { type ElementDetails, getElement } from "../getElement";
 
-// const isElementsOnly = /^([a-z]{2,4}[\s]*[0-9]{4,8}[\s,]*)+$/i;
+const isElementsOnly = /^([a-z]{2,4}[\s]*[0-9]{4,8}[\s,]*)+$/i;
 const matchElements = /([a-z]{2,4}[\s]*[0-9]{4,8})/gi;
 
 export type ProjectRecordBase = {
@@ -129,8 +129,7 @@ export function AddElementManualForm({
 				variant="contained"
 				size="large"
 				type="submit"
-				// disabled={!isElementsOnly.test(elementId) || working}
-				disabled={working}
+				disabled={(!allowEmptyElement && !isElementsOnly.test(elementId)) || working}
 				loading={working}
 				loadingPosition="end"
 				endIcon={<Add />}

package/src/elements/index.ts

@@ -7,3 +7,4 @@ export * from "./ElementDamage/RegisterFix.js";
 export * from "./ElementDamage/SubmitButtons.js";
 export * from "./ElementLookup.js";
 export * from "./ElementLookupDialog/index.js";
+export * from "./ProjectSelect.js";

package/es/shared/licenses.d.ts

@@ -1,3 +0,0 @@
-export declare const MUI_X_LICENSE_KEY = "2e85521ad276a984ae23b0ff4f90d6f8Tz0xMTI3MjEsRT0xNzc4NDU3NjAwMDAwLFM9cHJvLExNPXN1YnNjcmlwdGlvbixQVj1RMy0yMDI0LEtWPTI=";
-export declare const DYNAMSOFT_LICENSE_KEY = "f0068MgAAAANxSwGx926/p+panCB/t/lxxtrDYU0d2LFZhFiVZvQGh9fJ6+7AQ2S4w0KrYDE/+MHJO+GJ6I9EOPxRD40/CZE=";
-export declare const GOOGLE_MAPS_API_KEY: string;

package/es/shared/licenses.js

@@ -1,5 +0,0 @@
-export const MUI_X_LICENSE_KEY = "2e85521ad276a984ae23b0ff4f90d6f8Tz0xMTI3MjEsRT0xNzc4NDU3NjAwMDAwLFM9cHJvLExNPXN1YnNjcmlwdGlvbixQVj1RMy0yMDI0LEtWPTI=";
-export const DYNAMSOFT_LICENSE_KEY = "f0068MgAAAANxSwGx926/p+panCB/t/lxxtrDYU0d2LFZhFiVZvQGh9fJ6+7AQ2S4w0KrYDE/+MHJO+GJ6I9EOPxRD40/CZE=";
-export const GOOGLE_MAPS_API_KEY = process.env.NODE_ENV === "development"
-    ? "AIzaSyAe-z4UXfbPedkmuAeFtMIdOaeqqgVciQk"
-    : "AIzaSyDn6aKrA5yoBEwmoRHRgXceMmtZbR2R2xc";