Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding label for the subtext of the dialog #603

Merged
merged 6 commits into from
Jan 16, 2024
Merged

adding label for the subtext of the dialog #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92ce30d
adding label for the subtext of the dialog
polatengin Jan 15, 2024
79b5ab4
fixing linter warnings
polatengin Jan 15, 2024
ce2a3f2
fixing css styles
polatengin Jan 15, 2024
fd7d359
fixing css styles
polatengin Jan 15, 2024
9f6f36a
fixing css styles
polatengin Jan 15, 2024
d49add0
fixing css styles
polatengin Jan 15, 2024
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
16 changes: 8 additions & 8 deletions RetrospectiveExtension.Frontend/components/feedbackItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ class FeedbackItem extends React.Component<IFeedbackItemProps, IFeedbackItemStat
const isMainItem = isNotGroupedItem || this.props.groupedItemProps.isMainItem;
const isGroupedCarouselItem = this.props.isGroupedCarouselItem;
const groupItemsCount = this.props && this.props.groupedItemProps && this.props.groupedItemProps.groupedCount + 1;
const ariaLabel = isNotGroupedItem ? 'Feedback item.' : (!isMainItem ? 'Feedback group item.' : 'Feedback group main item. Group has ' + groupItemsCount + ' items.');
const ariaLabel = isNotGroupedItem ? 'Feedback item.' : (!isMainItem ? 'Feedback group item.' : `Feedback group main item. Group has ${groupItemsCount} items.`);
const hideFeedbackItems = this.props.hideFeedbackItems && (this.props.userIdRef !== getUserIdentity().id);
const curTimerState = this.props.timerState;
const originalColumnId = this.props.originalColumnId;
Expand Down Expand Up @@ -878,12 +878,12 @@ class FeedbackItem extends React.Component<IFeedbackItemProps, IFeedbackItemStat
<div className="group-child-feedback-stack">
<div className="related-feedback-header"> <i className="far fa-comments" />&nbsp;Related Feedback</div>
<ul className="fa-ul" aria-label="List of Related Feedback">
{childrenIds.map((id: string, index: React.Key) => {
{childrenIds.map((id: string) => {
const childCard: IColumnItem = this.props.columns[this.props.columnId]?.columnItems.find(c => c.feedbackItem.id === id);
const originalColumn = childCard ? this.props.columns[childCard.feedbackItem.originalColumnId] : null;

return childCard &&
<li key={index}>
<li key={id}>
<span className="fa-li" style={{ borderRightColor: originalColumn?.columnProperties?.accentColor }}><i className="fa-solid fa-quote-left" /></span>
<span className="related-feedback-title"
aria-label={'Title of the feedback is ' + childCard.feedbackItem.title}
Expand Down Expand Up @@ -942,8 +942,8 @@ class FeedbackItem extends React.Component<IFeedbackItemProps, IFeedbackItemStat
return <DefaultButton
key={columnId}
className="move-feedback-item-column-button"
onClick={async () => {
await this.props.moveFeedbackItem(
onClick={() => {
this.props.moveFeedbackItem(
this.props.refreshFeedbackItems,
this.props.boardId,
this.props.id,
Expand All @@ -961,20 +961,20 @@ class FeedbackItem extends React.Component<IFeedbackItemProps, IFeedbackItemStat
onDismiss={this.hideGroupFeedbackItemDialog}
dialogContentProps={{
type: DialogType.close,
title: 'Group Feedback',
subText: 'Search and select the feedback under which to group the current feedback.'
title: 'Group Feedback'
}}
modalProps={{
isBlocking: false,
containerClassName: 'retrospectives-group-feedback-item-dialog',
className: 'retrospectives-dialog-modal',
}}>
<label className="ms-Dialog-subText" htmlFor="feedback-item-search-input">Search and select the feedback under which to group the current feedback.</label>
<SearchBox
id="feedback-item-search-input"
autoFocus={true}
placeholder="Enter the feedback title"
aria-label="Enter the feedback title"
onChange={this.handleFeedbackItemSearchInputChange}
className="feedback-item-name-input"
/>
<div className="output-container">
{!this.state.searchedFeedbackItems.length && this.state.searchTerm &&
Expand Down
4 changes: 4 additions & 0 deletions RetrospectiveExtension.Frontend/css/feedbackItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,10 @@
.retrospectives-group-feedback-item-dialog {
background-color: var(--background-color);

.ms-SearchBox {
margin-top: 1em;
}

.ms-Dialog-title,
.ms-Dialog-subText {
color: var(--text-primary-color);
Expand Down
Loading