Skip to content

RI-7613: fix last item remove popover #5047

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 2 commits into from
Oct 9, 2025
Merged

RI-7613: fix last item remove popover #5047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bd888f
RI-7613: fix last item remove popover
ArtemHoruzhenko Oct 7, 2025
fe7e7f4
RI-7613: fix PR comments
ArtemHoruzhenko Oct 8, 2025
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
17 changes: 6 additions & 11 deletions redisinsight/ui/src/constants/help-texts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
UTM_MEDIUMS,
} from 'uiSrc/constants/links'

import styles from 'uiSrc/pages/browser/components/popover-delete/styles.module.scss'
import { CloudLink } from 'uiSrc/components/markdown'
import { getUtmExternalLink } from 'uiSrc/utils/links'
import { OAuthSocialSource } from 'uiSrc/slices/interfaces'
import { Text } from 'uiSrc/components/base/text'
import { RiIcon } from 'uiSrc/components/base/icons/RiIcon'
import { FeatureFlags } from './featureFlags'
import { Row } from 'uiSrc/components/base/layout/flex'

export default {
REJSON_SHOULD_BE_LOADED: (
Expand Down Expand Up @@ -43,16 +43,11 @@
</FeatureFlagComponent>
</>
),
REMOVE_LAST_ELEMENT: (fieldType: string) => (
<div className={styles.appendInfo}>
<RiIcon
type="ToastDangerIcon"
style={{ marginRight: '1rem', marginTop: '4px' }}
/>
<Text size="s">
If you remove the single {fieldType}, the whole Key will be deleted.
</Text>
</div>
REMOVE_LAST_ELEMENT: () => (

Check warning on line 46 in redisinsight/ui/src/constants/help-texts.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🕹️ Function is not covered 

Warning! Not covered function
<Row align="center">
<RiIcon size="s" type="ToastDangerIcon" style={{ marginRight: '1rem' }} />
<Text size="s">Removing the last item deletes the entire key.</Text>
</Row>
),
REMOVING_MULTIPLE_ELEMENTS_NOT_SUPPORT: (
<>
Expand Down
10 changes: 0 additions & 10 deletions redisinsight/ui/src/pages/browser/components/popover-delete/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,6 @@
word-wrap: break-word;
}

.appendInfo {
display: flex;
margin-top: 1rem;
color: var(--euiTextSubduedColor);

> div {
font-size: 12px !important;
}
}

.popoverFooter {
display: flex;
justify-content: flex-end;
Expand Down
2 changes: 1 addition & 1 deletion ...owser/modules/key-details/components/hash-details/hash-details-table/HashDetailsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@
handleDeleteItem={handleDeleteField}
handleButtonClick={handleRemoveIconClick}
appendInfo={
length === 1 ? HelpTexts.REMOVE_LAST_ELEMENT('Field') : null
length === 1 ? HelpTexts.REMOVE_LAST_ELEMENT : null

Check warning on line 532 in redisinsight/ui/src/pages/browser/modules/key-details/components/hash-details/hash-details-table/HashDetailsTable.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🌿 Branch is not covered 

Warning! Not covered branch
}
/>
</StopPropagation>
Expand Down
2 changes: 1 addition & 1 deletion .../browser/modules/key-details/components/set-details/set-details-table/SetDetailsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
handleButtonClick={handleRemoveIconClick}
testid={`set-remove-btn-${member}`}
appendInfo={
length === 1 ? HelpTexts.REMOVE_LAST_ELEMENT('Member') : null
length === 1 ? HelpTexts.REMOVE_LAST_ELEMENT : null

Check warning on line 294 in redisinsight/ui/src/pages/browser/modules/key-details/components/set-details/set-details-table/SetDetailsTable.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🌿 Branch is not covered 

Warning! Not covered branch
}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...owser/modules/key-details/components/zset-details/zset-details-table/ZSetDetailsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
handleButtonClick={handleRemoveIconClick}
testid={`zset-remove-button-${name}`}
appendInfo={
length === 1 ? HelpTexts.REMOVE_LAST_ELEMENT('Member') : null
length === 1 ? HelpTexts.REMOVE_LAST_ELEMENT : null

Check warning on line 445 in redisinsight/ui/src/pages/browser/modules/key-details/components/zset-details/zset-details-table/ZSetDetailsTable.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🌿 Branch is not covered 

Warning! Not covered branch
}
/>
</div>
Expand Down
Loading