Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions client/babel.config.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
presets: [
'@babel/preset-env',
'@babel/preset-react' // Add this if you are using React
],
plugins: ["@babel/plugin-transform-modules-commonjs"]
};
module.exports = {
presets: [
"@babel/preset-env",
"@babel/preset-react" // Add this if you are using React
],
plugins: ["@babel/plugin-transform-modules-commonjs"]
};
9 changes: 5 additions & 4 deletions client/jest.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,9 @@ module.exports = {
// ],

// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
"moduleNameMapper": {
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
moduleNameMapper: {
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$":
"<rootDir>/__mocks__/fileMock.js",
"\\.(css|less)$": "identity-obj-proxy"
},

Expand Down Expand Up @@ -173,9 +174,9 @@ module.exports = {

// A map from regular expressions to paths to transformers
transform: {
'^.+\\.(js|jsx)$': 'babel-jest',
"^.+\\.(js|jsx)$": "babel-jest"
//'^.+\\.(ts|tsx)$': 'ts-jest' // If using TypeScript
},
}
// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "\\\\node_modules\\\\",
Expand Down
34 changes: 29 additions & 5 deletions client/src/components/ProjectWizard/Common/RuleLabel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from "prop-types";
import { MdLink } from "react-icons/md";
import { createUseStyles, useTheme } from "react-jss";
import clsx from "clsx";
import { MdInfo } from "react-icons/md";
import { MdInfo, MdAddCircle } from "react-icons/md";

const useStyles = createUseStyles(theme => ({
labelWrapper: {
Expand All @@ -20,7 +20,13 @@ const useStyles = createUseStyles(theme => ({
labelWrapperWithoutDesc: {
flexGrow: "1",
flexShrink: "1",
flexBasis: "50%"
flexBasis: "50%",
"&:hover $iconContainer": {
visibility: "visible"
},
"&:hover": {
cursor: "pointer"
}
},
tooltipLabel: {
flexGrow: "1",
Expand Down Expand Up @@ -81,7 +87,8 @@ const RuleLabel = ({
link,
name,
setShowDescription,
showDescription
showDescription,
setIsEditing
}) => {
const theme = useTheme();
const classes = useStyles(theme);
Expand All @@ -93,6 +100,14 @@ const RuleLabel = ({
setShowDescription(prev => !prev);
};

const addDescriptionHandler = e => {
e.preventDefault();
e.stopPropagation();
if (setIsEditing) {
setIsEditing(prev => !prev);
}
};

// if (code && code.startsWith("UNITS_HABIT")) {
// return (
// <div
Expand Down Expand Up @@ -191,7 +206,15 @@ const RuleLabel = ({
>
<MdInfo className={classes.infoIcon} />
</span>
) : null}
) : (
<span
className={clsx("fa-layers fa-fw", classes.iconContainer)}
style={showDescription ? { visibility: "visible" } : {}}
onClick={addDescriptionHandler}
>
<MdAddCircle className={classes.infoIcon} />
</span>
)}
</div>
);
};
Expand All @@ -205,6 +228,7 @@ RuleLabel.propTypes = {
required: PropTypes.bool,
link: PropTypes.string,
setShowDescription: PropTypes.func,
showDescription: PropTypes.bool
showDescription: PropTypes.bool,
setIsEditing: PropTypes.func
};
export default RuleLabel;
30 changes: 23 additions & 7 deletions client/src/components/ProjectWizard/RuleInput/RuleInput.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,14 @@ const RuleInput = ({
const [showValidationErrors, setShowValidationErrors] = useState(false);
const [showDescription, setShowDescription] = useState(false);
const [inputError, setInputError] = useState(null);
const [isEditing, setIsEditing] = useState(false);
const [localDescription, setLocalDescription] = useState(description);

// Add callback to handle description updates
const handleDescriptionUpdate = newDescription => {
setLocalDescription(newDescription);
setIsEditing(false); // Close editing mode
};

const onInputChange = e => {
setShowValidationErrors(true);
Expand All @@ -191,14 +199,15 @@ const RuleInput = ({
>
<RuleLabel
id={id}
description={description}
description={localDescription}
code={code}
display={display}
required={required}
link={link}
name={name}
setShowDescription={setShowDescription}
showDescription={showDescription}
setIsEditing={setIsEditing}
/>

<div>
Expand Down Expand Up @@ -238,13 +247,14 @@ const RuleInput = ({
<div className={clsx(classes.rowContainer)}>
<RuleLabel
id={id}
description={description}
description={localDescription}
code={code}
display={display}
required={required}
link={link}
name={name}
setShowDescription={setShowDescription}
setIsEditing={setIsEditing}
/>
<input
type="checkbox"
Expand All @@ -266,13 +276,14 @@ const RuleInput = ({
>
<RuleLabel
id={id}
description={description}
description={localDescription}
code={code}
display={display}
required={required}
link={link}
name={name}
setShowDescription={setShowDescription}
setIsEditing={setIsEditing}
/>
<select
autoFocus={autoFocus}
Expand All @@ -299,14 +310,15 @@ const RuleInput = ({
>
<RuleLabel
id={id}
description={description}
description={localDescription}
code={code}
display={display}
required={required}
link={link}
name={name}
setShowDescription={setShowDescription}
showDescription={showDescription}
setIsEditing={setIsEditing}
/>

{dataType === "string" ? (
Expand Down Expand Up @@ -370,13 +382,14 @@ const RuleInput = ({
<div className={clsx(classes.rowContainer, classes.miscFieldWrapper)}>
<RuleLabel
id={id}
description={description}
description={localDescription}
code={code}
display={display}
required={required}
link={link}
name={name}
setShowDescription={setShowDescription}
setIsEditing={setIsEditing}
/>
<div className={classes.codeWrapper} name={code} id={code} />
<div className={classes.unitsCaption}>{units}</div>
Expand All @@ -398,10 +411,13 @@ const RuleInput = ({
</div>
</div>
) : null}
{showDescription && description ? (
{(showDescription && localDescription) || isEditing ? (
<AccordionToolTip
description={description}
description={localDescription || ""}
setShowDescription={setShowDescription}
id={id}
forceEditMode={isEditing}
onEditDescription={handleDescriptionUpdate}
/>
) : null}
</React.Fragment>
Expand Down
29 changes: 22 additions & 7 deletions client/src/components/ProjectWizard/RuleStrategy/RuleStrategy.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ const RuleStrategy = ({
useState(false);
const [inputEvent, setInputEvent] = useState({});
const [previousValue, setPreviousValue] = useState(value);
const [localDescription, setLocalDescription] = useState(description);
const [isEditing, setIsEditing] = useState(false);

const closeAffordableEdgeCaseModal = () => {
// Need to modify event to change value back to previous value and
Expand All @@ -159,6 +161,11 @@ const RuleStrategy = ({
setAffordableEdgeCaseModalOpen(false);
};

const handleDescriptionUpdate = newDescription => {
setLocalDescription(newDescription);
setIsEditing(false);
};

const onInputChangeIfAllowed = e => {
// If user changes affordable housing strategy to 100% for a Level 1
// project, we want to prompt them to confirm the change before
Expand Down Expand Up @@ -223,12 +230,13 @@ const RuleStrategy = ({
<div className={clsx(classes.rowContainer, disabledStyle)}>
<RuleLabel
id={id}
description={description}
description={localDescription}
code={code}
display={display}
link={link}
name={name}
setShowDescription={setShowDescription}
setIsEditing={setIsEditing}
/>
<div>
<input
Expand All @@ -253,12 +261,13 @@ const RuleStrategy = ({
<div className={clsx(classes.rowContainer, disabledStyle)}>
<RuleLabel
id={id}
description={description}
description={localDescription}
code={code}
display={display}
link={link}
name={name}
setShowDescription={setShowDescription}
setIsEditing={setIsEditing}
/>
<div>
<input
Expand All @@ -279,12 +288,13 @@ const RuleStrategy = ({
<div className={clsx(classes.rowContainer, disabledStyle)}>
<RuleLabel
id={id}
description={description}
description={localDescription}
code={code}
display={display}
link={link}
name={name}
setShowDescription={setShowDescription}
setIsEditing={setIsEditing}
/>
<div className={classes.choiceSelectContainer}>
<UniversalSelect
Expand All @@ -307,12 +317,13 @@ const RuleStrategy = ({
<div className={clsx(classes.rowContainer, disabledStyle)}>
<RuleLabel
id={id}
description={description}
description={localDescription}
code={code}
display={display}
link={link}
name={name}
setShowDescription={setShowDescription}
setIsEditing={setIsEditing}
/>
<input
autoFocus={autoFocus}
Expand All @@ -334,12 +345,13 @@ const RuleStrategy = ({
<div className={clsx(classes.rowContainer, disabledStyle)}>
<RuleLabel
id={id}
description={description}
description={localDescription}
code={code}
display={display}
link={link}
name={name}
setShowDescription={setShowDescription}
setIsEditing={setIsEditing}
/>
<div className={classes.allElse} name={code} />
{possibleAndEarnedPointsContainers()}
Expand Down Expand Up @@ -370,11 +382,14 @@ const RuleStrategy = ({
</div>
</div>
) : null}
{showDescription && description ? (
{(showDescription && localDescription) || isEditing ? (
<AccordionToolTip
description={description}
description={localDescription || ""}
setShowDescription={setShowDescription}
disabledStyle={disabledStyle}
id={id}
forceEditMode={isEditing}
onEditDescription={handleDescriptionUpdate}
/>
) : null}

Expand Down
Loading