modified disable

Author: collins-self

Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsModal.tsx

@@ -63,15 +63,15 @@ const LocationDrawingsModal = (props: IProps) => {
         setPageState('loading');
         LocationDrawingController.PagedSearch([], 'Name', true, 1, props.Location?.ID)
             .done((result) => {
-                setErrors(isValid(result));
+                const validationErrors = isValid(result);
+                setErrors(validationErrors);
                 setPageState('idle');
             })
             .fail(() => setPageState('error'));
     }, [props.Location?.ID])
 
     React.useEffect(() => {
         props.Errors(errors);
-
         const locationErrorsMap = new Map<OpenXDA.Types.Location, string[]>();
         locationErrorsMap.set(props.Location, errors);
 

Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/NewMeterWizard/NewMeterWizard.tsx

@@ -410,7 +410,10 @@ export default function NewMeterWizard(props: { IsEngineer: boolean }) {
             return (<>
                 <button
                     className={drawingsModalErrors.length > 0 ? "btn btn-primary disabled" : "btn btn-primary"}
-                    onClick={() => setShowDrawingsModal(true)}
+                    onClick={() => {
+                        if (drawingsModalErrors.length > 0) return;
+                        setShowDrawingsModal(true);
+                    }}
                     onMouseEnter={() => setHover('Drawings')}
                     onMouseLeave={() => setHover('None')}
                     data-tooltip={"DrawingsModal"}