Skip to content

Commit 6e76e7f

Browse files
committed
status checkbox on init
1 parent 5173a52 commit 6e76e7f

File tree

5 files changed

+11
-24
lines changed

5 files changed

+11
-24
lines changed

packages/dev/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"serve": "serve public"
1010
},
1111
"dependencies": {
12-
"@patternfly/quickstarts": "1.0.0-rc.15",
12+
"@patternfly/quickstarts": "1.0.0-rc.16",
1313
"@patternfly/react-core": "^4.101.3",
1414
"asciidoctor": "^2.2.1",
1515
"react": "^16.14.0",

packages/dev/src/App.tsx

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,11 @@ const App: React.FC<AppProps> = ({ children, showCardFooters }) => {
5353
console.log(allQuickStartStates);
5454
}, [allQuickStartStates]);
5555

56-
const [
57-
allQuickStartsLoaded,
58-
setAllQuickStartsLoaded,
59-
] = React.useState<boolean>(false);
6056
const [allQuickStarts, setAllQuickStarts] = React.useState<QuickStart[]>([]);
6157
React.useEffect(() => {
6258
const load = async () => {
6359
const masGuidesQuickstarts = await loadJSONQuickStarts("");
6460
setAllQuickStarts(yamlQuickStarts.concat(masGuidesQuickstarts));
65-
setAllQuickStartsLoaded(true);
6661
};
6762
load();
6863
}, []);
@@ -131,15 +126,13 @@ const App: React.FC<AppProps> = ({ children, showCardFooters }) => {
131126

132127
return (
133128
<React.Suspense fallback={<LoadingBox />}>
134-
{allQuickStartsLoaded && (
135-
<QuickStartContextProvider value={valuesForQuickstartContext}>
136-
<QuickStartDrawer>
137-
<Page header={AppHeader} sidebar={AppSidebar} isManagedSidebar>
138-
{children}
139-
</Page>
140-
</QuickStartDrawer>
141-
</QuickStartContextProvider>
142-
)}
129+
{allQuickStarts && allQuickStarts.length && <QuickStartContextProvider value={valuesForQuickstartContext}>
130+
<QuickStartDrawer>
131+
<Page header={AppHeader} sidebar={AppSidebar} isManagedSidebar>
132+
{children}
133+
</Page>
134+
</QuickStartDrawer>
135+
</QuickStartContextProvider>}
143136
</React.Suspense>
144137
);
145138
};

packages/module/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/quickstarts",
3-
"version": "1.0.0-rc.15",
3+
"version": "1.0.0-rc.16",
44
"description": "PatternFly quick starts",
55
"files": [
66
"dist"

packages/module/src/catalog/Toolbar/QuickStartCatalogFilterItems.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,15 @@ export const QuickStartCatalogFilterStatusWrapper: React.FC<QuickStartCatalogFil
163163
);
164164

165165
const dropdownItems = Object.entries(filter.status.statusTypes).map(([key, val]) => (
166-
<SelectOption key={key} data-key={key} value={val} />
166+
<SelectOption key={key} data-key={key} value={key}>{val}</SelectOption>
167167
));
168168

169169
return (
170170
<QuickStartCatalogFilterSelect
171171
isDropdownOpen={isDropdownOpen}
172172
setIsDropdownOpen={setIsDropdownOpen}
173173
onRowfilterSelect={onRowfilterSelect}
174-
selectedFilters={filter.status.selectedFilters}
174+
selectedFilters={filter.status.statusFilters}
175175
dropdownItems={dropdownItems}
176176
/>
177177
);

packages/module/src/utils/quick-start-context.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ export type QuickStartContextValues = {
5252
status?: {
5353
statusTypes?: any;
5454
statusFilters?: any;
55-
selectedFilters?: any;
5655
}
5756
}
5857
setFilter?: any;
@@ -124,9 +123,6 @@ export const QuickStartContextProvider: React.FC<{
124123
[QuickStartStatus.NOT_STARTED]: findResource('Not started ({{statusCount, number}})').replace('{{statusCount, number}}', quickStartStatusCount[QuickStartStatus.NOT_STARTED]),
125124
});
126125
const [statusFilters, setStatusFilters] = React.useState<string[]>(initialStatusFilters);
127-
const [selectedFilters, setSelectedFilters] = React.useState<string[]>(
128-
initialStatusFilters.map((filter) => statusTypes[filter]),
129-
);
130126

131127
const [filterKeyword, setFilterKeyword] = React.useState(initialSearchQuery);
132128

@@ -135,7 +131,6 @@ export const QuickStartContextProvider: React.FC<{
135131
setFilterKeyword(value);
136132
} else if (type === 'status') {
137133
setStatusFilters(value);
138-
setSelectedFilters(value.map((filterKey) => statusTypes[filterKey]));
139134
}
140135
};
141136

@@ -362,7 +357,6 @@ export const QuickStartContextProvider: React.FC<{
362357
status: {
363358
statusTypes,
364359
statusFilters,
365-
selectedFilters,
366360
}
367361
},
368362
setFilter,

0 commit comments

Comments
 (0)