From b5bbf7cd62aa86c6e4463e7d865e66fd03c1f86c Mon Sep 17 00:00:00 2001 From: Priscila Oliveira Date: Sun, 14 Feb 2021 21:05:41 +0100 Subject: [PATCH] ref(debug-images): Make filter option checked by default, except Unreferenced --- .../events/interfaces/debugMeta-v2/index.tsx | 78 +++++++++---------- 1 file changed, 36 insertions(+), 42 deletions(-) diff --git a/src/sentry/static/sentry/app/components/events/interfaces/debugMeta-v2/index.tsx b/src/sentry/static/sentry/app/components/events/interfaces/debugMeta-v2/index.tsx index 9a83d5971122b3..278a2be1c49bee 100644 --- a/src/sentry/static/sentry/app/components/events/interfaces/debugMeta-v2/index.tsx +++ b/src/sentry/static/sentry/app/components/events/interfaces/debugMeta-v2/index.tsx @@ -13,13 +13,11 @@ import styled from '@emotion/styled'; import {openModal} from 'app/actionCreators/modal'; import GuideAnchor from 'app/components/assistant/guideAnchor'; import Button from 'app/components/button'; -import EmptyStateWarning from 'app/components/emptyStateWarning'; import EventDataSection from 'app/components/events/eventDataSection'; import {getImageRange, parseAddress} from 'app/components/events/interfaces/utils'; import {PanelTable} from 'app/components/panels'; import QuestionTooltip from 'app/components/questionTooltip'; import SearchBar from 'app/components/searchBar'; -import {IconSearch} from 'app/icons/iconSearch'; import {t} from 'app/locale'; import DebugMetaStore, {DebugMetaActions} from 'app/stores/debugMetaStore'; import overflowEllipsis from 'app/styles/overflowEllipsis'; @@ -27,7 +25,6 @@ import space from 'app/styles/space'; import {Organization, Project} from 'app/types'; import {Image, ImageStatus} from 'app/types/debugImage'; import {Event} from 'app/types/event'; -import EmptyMessage from 'app/views/settings/components/emptyMessage'; import Status from './debugImage/status'; import DebugImage from './debugImage'; @@ -294,7 +291,10 @@ class DebugMeta extends React.PureComponent { this.setState({ filteredImages, filterOptions, - filteredImagesByFilter: filteredImages, + filteredImagesByFilter: this.getFilteredImagesByFilter( + filteredImages, + filterOptions + ), filteredImagesBySearch: filteredImages, }); } @@ -303,7 +303,7 @@ class DebugMeta extends React.PureComponent { return [...new Set(images.map(image => image.status))].map(status => ({ id: status, symbol: , - isChecked: false, + isChecked: status !== ImageStatus.UNUSED, })); } @@ -435,48 +435,40 @@ class DebugMeta extends React.PureComponent { ); } - renderContent() { + getEmptyMessage() { const {searchTerm, filteredImagesByFilter: images, filterOptions} = this.state; - if (searchTerm && !images.length) { - const hasActiveFilter = filterOptions.find(filterOption => filterOption.isChecked); - return ( - } - action={ - hasActiveFilter ? ( - - ) : ( - - ) - } - > - {t('Sorry, no images match your search query.')} - - ); + if (!!images.length) { + return null; } - if (!images.length) { + if (searchTerm && !images.length) { + const hasActiveFilter = filterOptions.find(filterOption => filterOption.isChecked); return ( - -

{t('There are no images to be displayed')}

-
+ +

{t('Sorry, no images match your search query')}

+ {hasActiveFilter ? ( + + ) : ( + + )} +
); } - return
{this.renderList()}
; + return t('There are no images to be displayed'); } render() { const { searchTerm, filterOptions, - filteredImagesByFilter: images, scrollbarWidth, + filteredImagesByFilter: images, } = this.state; return ( @@ -510,12 +502,12 @@ class DebugMeta extends React.PureComponent { isCentered > - {this.renderContent()} +
{this.renderList()}
); @@ -551,13 +543,15 @@ const StyledPanelTable = styled(PanelTable)<{scrollbarWidth?: number}>` } } - ${p => - !p.isEmpty && - `:nth-child(n + 6) { - display: grid; - grid-column: 1/-1; - padding: 0; - }`} + :nth-child(n + 6) { + grid-column: 1/-1; + ${p => + !p.isEmpty && + ` + display: grid; + padding: 0; + `} + } } ${p => layout(p.theme, p.scrollbarWidth)}