Skip to content

Commit 0787086

Browse files
authored
fix: add message when no results found in search (#3479)
1 parent b8855b0 commit 0787086

File tree

3 files changed

+49
-26
lines changed

3 files changed

+49
-26
lines changed

src/authorizations/components/redesigned/AllAccordionBody.tsx

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,32 @@ export const AllAccordionBody: FC<OwnProps> = props => {
8282
</FlexBox>
8383
)
8484

85+
const getAccordionBody = () => {
86+
return permissions.length !== 0 ? (
87+
Object.keys(permissions).map(key => {
88+
const names = permissions[key].name
89+
const resourceName = names.charAt(0).toUpperCase() + names.slice(1)
90+
91+
return (
92+
<Accordion.AccordionBodyItem
93+
key={key}
94+
className="resource-accordion-body"
95+
>
96+
{AllResourceAccordionBody(permissions[key], resourceName)}
97+
</Accordion.AccordionBodyItem>
98+
)
99+
})
100+
) : (
101+
<Accordion.AccordionBodyItem className="resource-accordion-error">
102+
{`No ${resourceName.replace('All ', '')} match your search term`}
103+
</Accordion.AccordionBodyItem>
104+
)
105+
}
106+
85107
return (
86108
<>
87109
{resourceName === 'All Resources' ? (
88-
Object.keys(permissions).map(key => {
89-
const names = permissions[key].name
90-
const resourceName = names.charAt(0).toUpperCase() + names.slice(1)
91-
92-
return (
93-
<Accordion.AccordionBodyItem
94-
key={key}
95-
className="resource-accordion-body"
96-
>
97-
{AllResourceAccordionBody(permissions[key], resourceName)}
98-
</Accordion.AccordionBodyItem>
99-
)
100-
})
110+
getAccordionBody()
101111
) : (
102112
<Accordion.AccordionBodyItem className="resource-accordion-body">
103113
{AllResourceAccordionBody()}

src/authorizations/components/redesigned/IndividualAccordionBody.tsx

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,26 +94,33 @@ export const IndividualAccordionBody: FC<Props> = props => {
9494
</FlexBox>
9595
)
9696

97+
const getAccordionBody = () => {
98+
return sortedPermissions.length !== 0 ? (
99+
Object.keys(sortedPermissions).map(key => {
100+
return (
101+
<Accordion.AccordionBodyItem
102+
key={sortedPermissions[key].id}
103+
className="resource-accordion-body"
104+
>
105+
{accordionBody(sortedPermissions[key])}
106+
</Accordion.AccordionBodyItem>
107+
)
108+
})
109+
) : (
110+
<Accordion.AccordionBodyItem className="resource-accordion-error">
111+
{`No ${resourceName} match your search term`}
112+
</Accordion.AccordionBodyItem>
113+
)
114+
}
115+
97116
return (
98117
<>
99118
{title ? (
100119
<Accordion.AccordionBodyItem className="resource-accordion-body">
101120
{title}
102121
</Accordion.AccordionBodyItem>
103122
) : null}
104-
105-
{permissions
106-
? Object.keys(sortedPermissions).map(key => {
107-
return (
108-
<Accordion.AccordionBodyItem
109-
key={sortedPermissions[key].id}
110-
className="resource-accordion-body"
111-
>
112-
{accordionBody(sortedPermissions[key])}
113-
</Accordion.AccordionBodyItem>
114-
)
115-
})
116-
: null}
123+
{permissions ? getAccordionBody() : null}
117124
</>
118125
)
119126
}

src/authorizations/components/redesigned/customApiTokenOverlay.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,10 @@
2828
.resource-accordion-body {
2929
padding-top: 10px;
3030
padding-bottom: 10px;
31+
font-weight: bold;
32+
}
33+
34+
.resource-accordion-error {
35+
justify-content: center;
36+
color: gray;
3137
}

0 commit comments

Comments
 (0)