Skip to content

Commit fcec6a3

Browse files
jyash97CompuIves
authored andcommitted
fix filter options in deleted sandboxes (codesandbox#2013)
1 parent 1cce268 commit fcec6a3

File tree

1 file changed

+45
-39
lines changed
  • packages/app/src/app/pages/Dashboard/Content/Sandboxes/Filters/FilterOptions

1 file changed

+45
-39
lines changed

packages/app/src/app/pages/Dashboard/Content/Sandboxes/Filters/FilterOptions/index.js

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,54 +24,60 @@ const FilterOptions = ({ possibleTemplates, hideFilters, store, signals }) => {
2424

2525
const Overlay = () => (
2626
<OverlayContainer>
27-
{orderBy(
28-
Object.keys(templates)
29-
.filter(x => x !== 'default')
30-
.map(name => templates[name])
31-
.filter(
32-
x =>
33-
possibleTemplates.length === 0 ||
34-
possibleTemplates.indexOf(x.name) > -1
35-
),
36-
'niceName'
37-
).map(template => {
38-
const selected = store.dashboard.isTemplateSelected(template.name);
27+
{possibleTemplates.length > 0 ? (
28+
<React.Fragment>
29+
{orderBy(
30+
Object.keys(templates)
31+
.filter(x => x !== 'default')
32+
.map(name => templates[name])
33+
.filter(
34+
x =>
35+
possibleTemplates.length === 0 ||
36+
possibleTemplates.indexOf(x.name) > -1
37+
),
38+
'niceName'
39+
).map(template => {
40+
const selected = store.dashboard.isTemplateSelected(template.name);
41+
42+
return (
43+
<Option
44+
toggleTemplate={toggleTemplate}
45+
selected={selected}
46+
key={template.name}
47+
color={template.color}
48+
name={template.name}
49+
niceName={template.niceName}
50+
/>
51+
);
52+
})}
3953

40-
return (
4154
<Option
42-
toggleTemplate={toggleTemplate}
43-
selected={selected}
44-
key={template.name}
45-
color={template.color}
46-
name={template.name}
47-
niceName={template.niceName}
55+
toggleTemplate={() => {
56+
if (!allSelected) {
57+
signals.dashboard.blacklistedTemplatesCleared();
58+
} else {
59+
signals.dashboard.blacklistedTemplatesChanged({
60+
templates: possibleTemplates || [],
61+
});
62+
}
63+
}}
64+
selected={allSelected}
65+
color="#374140"
66+
name="all"
67+
style={{ marginTop: '1rem' }}
68+
niceName="Select All"
4869
/>
49-
);
50-
})}
51-
52-
<Option
53-
toggleTemplate={() => {
54-
if (!allSelected) {
55-
signals.dashboard.blacklistedTemplatesCleared();
56-
} else {
57-
signals.dashboard.blacklistedTemplatesChanged({
58-
templates: possibleTemplates || [],
59-
});
60-
}
61-
}}
62-
selected={allSelected}
63-
color="#374140"
64-
name="all"
65-
style={{ marginTop: '1rem' }}
66-
niceName="Select All"
67-
/>
70+
</React.Fragment>
71+
) : (
72+
'No templates found'
73+
)}
6874
</OverlayContainer>
6975
);
7076

7177
const { blacklistedTemplates } = store.dashboard.filters;
7278
const templateCount = possibleTemplates.length - blacklistedTemplates.length;
7379
const templateMessage =
74-
templateCount === possibleTemplates.length
80+
templateCount === possibleTemplates.length && templateCount > 0
7581
? 'all templates'
7682
: `${Math.max(0, templateCount)} ${
7783
templateCount === 1 ? 'template' : 'templates'

0 commit comments

Comments
 (0)