From 5770013799418a98f54a27300f5599dfc1601c8c Mon Sep 17 00:00:00 2001 From: Chad Elliott Date: Tue, 7 Jan 2025 07:46:13 -0600 Subject: [PATCH 01/10] Changed the comment boxes to single line, expanding to 4 and changed the required title to use a red asterisk. --- web-ui/src/components/pulse/Pulse.css | 4 ++++ web-ui/src/components/pulse/Pulse.jsx | 7 +++++-- web-ui/src/pages/PulsePage.jsx | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/web-ui/src/components/pulse/Pulse.css b/web-ui/src/components/pulse/Pulse.css index 4fc7240f9e..fb73042e5a 100644 --- a/web-ui/src/components/pulse/Pulse.css +++ b/web-ui/src/components/pulse/Pulse.css @@ -20,6 +20,10 @@ margin-bottom: 1rem; padding: 1rem; } + + .title-row { + display: flex; + } } :root[data-mui-color-scheme='dark'] { diff --git a/web-ui/src/components/pulse/Pulse.jsx b/web-ui/src/components/pulse/Pulse.jsx index 379942c6d8..3382d8313d 100644 --- a/web-ui/src/components/pulse/Pulse.jsx +++ b/web-ui/src/components/pulse/Pulse.jsx @@ -44,7 +44,10 @@ const Pulse = ({ title }) => (
- {title} +
+ {title} + {commentRequired && *} +
{icons.map((sentiment, index) => ( @@ -70,7 +73,7 @@ const Pulse = ({ }} placeholder="Comment" required={commentRequired} - rows={4} + maxRows={4} value={comment} />
diff --git a/web-ui/src/pages/PulsePage.jsx b/web-ui/src/pages/PulsePage.jsx index ef6877f019..67fab04e83 100644 --- a/web-ui/src/pages/PulsePage.jsx +++ b/web-ui/src/pages/PulsePage.jsx @@ -120,10 +120,11 @@ const PulsePage = () => { Date: Tue, 7 Jan 2025 08:06:03 -0600 Subject: [PATCH 02/10] Updated test snapshots. --- .../pulse/__snapshots__/Pulse.test.jsx.snap | 13 +++--- .../__snapshots__/PulsePage.test.jsx.snap | 43 ++++++++++++++----- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/web-ui/src/components/pulse/__snapshots__/Pulse.test.jsx.snap b/web-ui/src/components/pulse/__snapshots__/Pulse.test.jsx.snap index 63e99f560f..663e3ad4d4 100644 --- a/web-ui/src/components/pulse/__snapshots__/Pulse.test.jsx.snap +++ b/web-ui/src/components/pulse/__snapshots__/Pulse.test.jsx.snap @@ -6,11 +6,15 @@ exports[`renders correctly 1`] = `
-
- How are you feeling about work today? (*) -
+
+ How are you feeling about work today? (*) +
+
@@ -203,7 +207,6 @@ exports[`renders correctly 1`] = ` class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputMultiline css-1sqnrkk-MuiInputBase-input-MuiOutlinedInput-input" id=":r5:" placeholder="Comment" - rows="4" style="height: 0px; overflow: hidden;" > Just testing diff --git a/web-ui/src/pages/__snapshots__/PulsePage.test.jsx.snap b/web-ui/src/pages/__snapshots__/PulsePage.test.jsx.snap index f433cc329b..55bdddcf1c 100644 --- a/web-ui/src/pages/__snapshots__/PulsePage.test.jsx.snap +++ b/web-ui/src/pages/__snapshots__/PulsePage.test.jsx.snap @@ -8,11 +8,20 @@ exports[`renders correctly 1`] = `
-
- How are you feeling about work today? (*) -
+
+ How are you feeling about work today? +
+
+ * +
+
@@ -190,12 +199,19 @@ exports[`renders correctly 1`] = ` data-testid="comment-input" >