Skip to content

Revert "#RI-5473 - fix query card header" #3109

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

Merged
merged 1 commit into from
Feb 28, 2024
Merged

Revert "#RI-5473 - fix query card header" #3109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
299 changes: 149 additions & 150 deletions redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,11 @@ const QueryCardHeader = (props: Props) => {
data-testid="query-card-open"
role="button"
>
<EuiFlexGroup alignItems="center" justifyContent="spaceBetween" gutterSize="m" responsive={false} style={{ width: '100%' }}>
<EuiFlexItem className={styles.titleWrapper} grow>
<EuiFlexGroup alignItems="center" gutterSize="l" responsive={false} style={{ width: '100%' }}>
<EuiFlexItem
className={styles.titleWrapper}
grow={false}
>
<div className="copy-btn-wrapper">
<EuiTextColor className={styles.title} color="subdued" component="div" data-testid="query-card-command">
<QueryCardTooltip query={query} summary={summaryText} db={db} resultsMode={resultsMode} />
Expand All @@ -308,160 +311,156 @@ const QueryCardHeader = (props: Props) => {
/>
</div>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFlexGroup alignItems="center" gutterSize="m" responsive={false}>
<EuiFlexItem className={cx(styles.time)} data-testid="command-execution-date-time">
{!!createdAt && (
<EuiTextColor className={styles.timeText} component="div">
{getFormatTime()}
</EuiTextColor>
)}
</EuiFlexItem>
<EuiFlexItem grow={false} className={styles.summaryTextWrapper}>
{!!message && !isOpen && (
<EuiTextColor className={styles.summaryText} component="div">
{truncateText(message, 13)}
</EuiTextColor>
)}
</EuiFlexItem>
<EuiFlexItem grow={false} className={styles.executionTime} data-testid="command-execution-time">
{isNumber(executionTime) && (
<EuiToolTip
title="Processing Time"
content={getExecutionTimeString(executionTime)}
position="left"
anchorClassName={cx(styles.tooltipIcon, styles.alignCenter)}
data-testid="execution-time-tooltip"
>
<>
<EuiIcon
type={ExecutionTimeIcon}
data-testid="command-execution-time-icon"
className={styles.iconExecutingTime}
/>
<EuiTextColor
className={cx(styles.summaryText, styles.executionTimeValue)}
data-testid="command-execution-time-value"
>
{getTruncatedExecutionTimeString(executionTime)}
</EuiTextColor>
</>
</EuiToolTip>
)}
</EuiFlexItem>
<EuiFlexItem
grow={false}
className={cx(styles.buttonIcon, styles.viewTypeIcon)}
onClick={onDropDownViewClick}
<EuiFlexItem className={cx(styles.time)} data-testid="command-execution-date-time">
{!!createdAt && (
<EuiTextColor className={styles.timeText} component="div">
{getFormatTime()}
</EuiTextColor>
)}
</EuiFlexItem>
<EuiFlexItem grow={false} className={styles.summaryTextWrapper}>
{!!message && !isOpen && (
<EuiTextColor className={styles.summaryText} component="div">
{truncateText(message, 13)}
</EuiTextColor>
)}
</EuiFlexItem>
<EuiFlexItem grow={false} className={styles.executionTime} data-testid="command-execution-time">
{isNumber(executionTime) && (
<EuiToolTip
title="Processing Time"
content={getExecutionTimeString(executionTime)}
position="left"
anchorClassName={cx(styles.tooltipIcon, styles.alignCenter)}
data-testid="execution-time-tooltip"
>
{isOpen && canCommandProfile && !summaryText && (
<div className={styles.dropdownWrapper}>
<div className={styles.dropdown}>
<EuiSuperSelect
options={profileOptions}
itemClassName={cx(styles.changeViewItem, styles.dropdownProfileItem)}
className={cx(styles.changeView, styles.dropdownProfileIcon)}
valueOfSelected={ProfileQueryType.Profile}
onChange={(value: ProfileQueryType) => onQueryProfile(value)}
data-testid="run-profile-type"
/>
</div>
</div>
)}
</EuiFlexItem>
<EuiFlexItem
grow={false}
className={cx(styles.buttonIcon, styles.viewTypeIcon)}
onClick={onDropDownViewClick}
<>
<EuiIcon
type={ExecutionTimeIcon}
data-testid="command-execution-time-icon"
className={styles.iconExecutingTime}
/>
<EuiTextColor
className={cx(styles.timeText, styles.executionTimeValue)}
data-testid="command-execution-time-value"
>
{getTruncatedExecutionTimeString(executionTime)}
</EuiTextColor>
</>
</EuiToolTip>
)}
</EuiFlexItem>
<EuiFlexItem
grow={false}
className={cx(styles.buttonIcon, styles.viewTypeIcon)}
onClick={onDropDownViewClick}
>
{isOpen && canCommandProfile && !summaryText && (
<div className={styles.dropdownWrapper}>
<div className={styles.dropdown}>
<EuiSuperSelect
options={profileOptions}
itemClassName={cx(styles.changeViewItem, styles.dropdownProfileItem)}
className={cx(styles.changeView, styles.dropdownProfileIcon)}
valueOfSelected={ProfileQueryType.Profile}
onChange={(value: ProfileQueryType) => onQueryProfile(value)}
data-testid="run-profile-type"
/>
</div>
</div>
)}
</EuiFlexItem>
<EuiFlexItem
grow={false}
className={cx(styles.buttonIcon, styles.viewTypeIcon)}
onClick={onDropDownViewClick}
>
{isOpen && options.length > 1 && !summaryText && (
<div className={styles.dropdownWrapper}>
<div className={styles.dropdown}>
<EuiSuperSelect
options={modifiedOptions}
itemClassName={cx(styles.changeViewItem)}
className={cx(styles.changeView)}
valueOfSelected={selectedValue}
onChange={(value: string) => onChangeView(value)}
data-testid="select-view-type"
/>
</div>
</div>
)}
</EuiFlexItem>
<EuiFlexItem grow={false} className={styles.buttonIcon} onClick={onDropDownViewClick}>
{(isOpen || isFullScreen) && (
<FullScreen isFullScreen={isFullScreen} onToggleFullScreen={toggleFullScreen} />
)}
</EuiFlexItem>
<EuiFlexItem grow={false} className={styles.buttonIcon}>
<EuiButtonIcon
disabled={loading || clearing}
iconType="trash"
aria-label="Delete command"
data-testid="delete-command"
onClick={handleQueryDelete}
/>
</EuiFlexItem>
{!isFullScreen && (
<EuiFlexItem grow={false} className={cx(styles.buttonIcon, styles.playIcon)}>
<EuiToolTip
content="Run again"
position="left"
>
{isOpen && options.length > 1 && !summaryText && (
<div className={styles.dropdownWrapper}>
<div className={styles.dropdown}>
<EuiSuperSelect
options={modifiedOptions}
itemClassName={cx(styles.changeViewItem)}
className={cx(styles.changeView)}
valueOfSelected={selectedValue}
onChange={(value: string) => onChangeView(value)}
data-testid="select-view-type"
/>
</div>
</div>
)}
</EuiFlexItem>
<EuiFlexItem grow={false} className={styles.buttonIcon} onClick={onDropDownViewClick}>
{(isOpen || isFullScreen) && (
<FullScreen isFullScreen={isFullScreen} onToggleFullScreen={toggleFullScreen} />
)}
</EuiFlexItem>
<EuiFlexItem grow={false} className={styles.buttonIcon}>
<EuiButtonIcon
disabled={loading || clearing}
iconType="trash"
aria-label="Delete command"
data-testid="delete-command"
onClick={handleQueryDelete}
disabled={emptyCommand}
iconType="play"
aria-label="Re-run command"
data-testid="re-run-command"
onClick={handleQueryReRun}
/>
</EuiFlexItem>
{!isFullScreen && (
<EuiFlexItem grow={false} className={cx(styles.buttonIcon, styles.playIcon)}>
<EuiToolTip
content="Run again"
position="left"
>
<EuiButtonIcon
disabled={emptyCommand}
iconType="play"
aria-label="Re-run command"
data-testid="re-run-command"
onClick={handleQueryReRun}
/>
</EuiToolTip>
</EuiFlexItem>
)}
{!isFullScreen && (
<EuiFlexItem grow={false} className={styles.buttonIcon}>
{!isSilentModeWithoutError(resultsMode, summary?.fail)
&& <EuiButtonIcon iconType={isOpen ? 'arrowUp' : 'arrowDown'} aria-label="toggle collapse" />}
</EuiFlexItem>
)}
<EuiFlexItem grow={false} className={styles.buttonIcon}>
{(isRawMode(mode) || isGroupResults(resultsMode)) && (
<EuiToolTip
className={styles.tooltip}
anchorClassName={styles.tooltipAnchor}
content={(
<>
{isGroupMode(resultsMode) && (
<EuiTextColor className={cx(styles.mode)} data-testid="group-mode-tooltip">
<EuiIcon type={GroupModeIcon} />
</EuiTextColor>
)}
{isSilentMode(resultsMode) && (
<EuiTextColor className={cx(styles.mode)} data-testid="silent-mode-tooltip">
<EuiIcon type={SilentModeIcon} />
</EuiTextColor>
)}
{isRawMode(mode) && (
<EuiTextColor className={cx(styles.mode)} data-testid="raw-mode-tooltip">
-r
</EuiTextColor>
)}
</>
</EuiToolTip>
</EuiFlexItem>
)}
{!isFullScreen && (
<EuiFlexItem grow={false} className={styles.buttonIcon}>
{!isSilentModeWithoutError(resultsMode, summary?.fail)
&& <EuiButtonIcon iconType={isOpen ? 'arrowUp' : 'arrowDown'} aria-label="toggle collapse" />}
</EuiFlexItem>
)}
{(isRawMode(mode) || isGroupResults(resultsMode)) && (
<EuiFlexItem grow={false} className={styles.buttonIcon}>
<EuiToolTip
className={styles.tooltip}
anchorClassName={styles.tooltipAnchor}
content={(
<>
{isGroupMode(resultsMode) && (
<EuiTextColor className={cx(styles.mode)} data-testid="group-mode-tooltip">
<EuiIcon type={GroupModeIcon} />
</EuiTextColor>
)}
position="bottom"
data-testid="parameters-tooltip"
>
<EuiIcon
color="subdued"
type="boxesVertical"
data-testid="parameters-anchor"
/>
</EuiToolTip>
{isSilentMode(resultsMode) && (
<EuiTextColor className={cx(styles.mode)} data-testid="silent-mode-tooltip">
<EuiIcon type={SilentModeIcon} />
</EuiTextColor>
)}
{isRawMode(mode) && (
<EuiTextColor className={cx(styles.mode)} data-testid="raw-mode-tooltip">
-r
</EuiTextColor>
)}
</>
)}
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
position="bottom"
data-testid="parameters-tooltip"
>
<EuiIcon
color="subdued"
type="boxesVertical"
data-testid="parameters-anchor"
/>
</EuiToolTip>
</EuiFlexItem>
)}
</EuiFlexGroup>
</div>
)
Expand Down
31 changes: 27 additions & 4 deletions redisinsight/ui/src/components/query-card/QueryCardHeader/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,28 @@ $marginIcon: 12px;
}
}

.titleWrapper {
width: calc(100% - 552px);
min-width: calc(100% - 552px);

@media (min-width: $breakpoint-m) {
width: calc(100% - 689px);
min-width: calc(100% - 689px);
}
}

:global(.fullscreen) .titleWrapper {
width: calc(100% - 402px);

@media (min-width: $breakpoint-m) {
width: calc(100% - 474px);
}

@media (min-width: $breakpoint-l) {
width: calc(100% - 519px);
}
}

.title {
display: inline-block;
font: normal normal normal 13px/17px Graphik, sans-serif !important;
Expand All @@ -61,8 +83,9 @@ $marginIcon: 12px;
}

.time {
max-width: 90px;
max-width: 70px;
position: relative;
height: 18px;
}

.mode + .mode {
Expand Down Expand Up @@ -148,8 +171,8 @@ $marginIcon: 12px;
width: 13px;

@media (min-width: $breakpoint-m) {
min-width: 92px;
width: 92px;
min-width: 58px;
width: 58px;
}
}

Expand All @@ -174,7 +197,7 @@ $marginIcon: 12px;
display: flex;
align-items: center;
position: relative;
padding: 0 0 3px 8px;
padding: 3px 0 3px 8px;

span {
margin-left: 10px;
Expand Down