Merge pull request #179 from MeasureAuthoringTool/MAT-5727/fixCanEdit

fixed can edit
MeasureAuthoringTool · Jun 20, 2023 · f7f3583 · f7f3583
2 parents 5430dbd + 3980b9a
commit f7f3583
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 3 deletions.
diff --git a/react/components/DateField/DateField.jsx b/react/components/DateField/DateField.jsx
@@ -39,7 +39,7 @@ export const dateTextFieldStyle = {
     },
 };
 
-const DateField = ({ label, value, handleDateChange }) => {
+const DateField = ({ label, value, handleDateChange, disabled }) => {
     return (
         <LocalizationProvider dateAdapter={AdapterDayjs}>
             <InputLabel
@@ -66,6 +66,7 @@ const DateField = ({ label, value, handleDateChange }) => {
             <DatePicker
                 value={value ? value : null}
                 onChange={handleDateChange}
+                disabled={disabled}
                 slotProps={{
                     textField: {
                         id: "date",
@@ -80,6 +81,7 @@ DateField.propTypes = {
     label: PropTypes.string.isRequired,
     value: PropTypes.object,
     handleDateChange: PropTypes.func.isRequired,
+    disabled:PropTypes.bool
 };
 
 export default DateField;
diff --git a/react/components/DateField/DateField.stories.jsx b/react/components/DateField/DateField.stories.jsx
@@ -16,6 +16,7 @@ export const DateFieldComponent = (args) => {
     return (
         <div className="qpp-u-padding--16">
             <DateField
+                disabled={false}
                 label="Status Date"
                 handleDateChange={handleDateChange}
                 value={value}

diff --git a/react/components/DateTimeField/DateTimeField.jsx b/react/components/DateTimeField/DateTimeField.jsx
@@ -40,7 +40,8 @@ export const dateTimeTextFieldStyle = {
     },
 };
 
-const DateTimeField = ({ label, dateTimeValue, handleDateTimeChange }) => {
+const DateTimeField = ({ label, dateTimeValue, handleDateTimeChange,disabled }) => {
+    console.log(disabled)
     return (
         <FormControl>
             <LocalizationProvider dateAdapter={AdapterDayjs}>
@@ -54,6 +55,7 @@ const DateTimeField = ({ label, dateTimeValue, handleDateTimeChange }) => {
                     value={dateTimeValue ? dateTimeValue : null}
                     onChange={handleDateTimeChange}
                     views={["year", "day", "hours", "minutes"]}
+                    disabled={disabled}
                     slotProps={{
                         textField: {
                             id: "dateTime",
@@ -69,6 +71,7 @@ DateTimeField.propTypes = {
     dateTimeValue: PropTypes.object,
     handleDateTimeChange: PropTypes.func.isRequired,
     label: PropTypes.string.isRequired,
+    disabled:PropTypes.bool
 };
 
 export default DateTimeField;
diff --git a/react/components/DateTimeField/DateTimeField.stories.jsx b/react/components/DateTimeField/DateTimeField.stories.jsx
@@ -17,6 +17,7 @@ export const TimeDateFieldComponent = (args) => {
     return (
         <div className="qpp-u-padding--16">
             <DateTimeField
+                disabled={true}
                 label="Status Date/Time"
                 handlDateTimeChange={handlDateTimeChange}
                 dateTimeValue={value}

diff --git a/react/package.json b/react/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@madie/madie-design-system",
-    "version": "1.0.50",
+    "version": "1.0.51",
     "description": "Shared style guide across the Madie program.",
     "main": "dist/index.js",
     "homepage": "https://github.com/MeasureAuthoringTool/madie-design-system",

diff --git a/react/test/components/DateField.test.js b/react/test/components/DateField.test.js
@@ -15,6 +15,7 @@ describe("DateField", () => {
                     label="Status Date"
                     value={dayjs("2022-04-17")}
                     handleDateChange={() => console.log("Status Date")}
+                    disabled={false}
                 />
             );
 

diff --git a/react/test/components/DateTimeField.test.js b/react/test/components/DateTimeField.test.js
@@ -17,6 +17,7 @@ describe("DateTimeField", () => {
                     handleDateTimeChange={() => {
                         return;
                     }}
+                    disabled={false}
                 />
             );