Skip to content
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.

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

Do not unnecessarily fetch stories/taxonomies #12653

Merged
merged 39 commits into from
Nov 23, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
c33efa3
Do not unnecessarily fetch stories/taxonomies
swissspidy Nov 9, 2022
fce7a49
Add defaults
swissspidy Nov 9, 2022
76900e0
Merge branch 'main' into fix/dashboard-requests
swissspidy Nov 10, 2022
8ad303b
Saved Templates: fix buttons being hidden under elements (#12610)
miina Nov 10, 2022
037a9bc
Reworking the `elements` package (#12557)
Nov 11, 2022
409c3e9
use-slug (#12675)
timarney Nov 11, 2022
8d95cb6
Update get authors call to use capabilities (#12671)
timarney Nov 11, 2022
8fa845c
Update lock file
swissspidy Nov 11, 2022
1c586d5
Fix recent PHPStan errors (#12677)
swissspidy Nov 14, 2022
874c58c
Migrate templates and text sets to latest version (#12678)
googleforcreators-bot Nov 14, 2022
be82281
Update list of Google Fonts (#12679)
googleforcreators-bot Nov 14, 2022
58b4314
Use `strict_types` where appropriate (#12631)
spacedmonkey Nov 14, 2022
470c42e
E2E Tests: Remove WP 5.8 compatibility code (#12680)
spacedmonkey Nov 14, 2022
931cb9e
Bump step-security/harden-runner from 1.5.0 to 2.0.0 (#12687)
dependabot[bot] Nov 15, 2022
c15b7fa
Bump google-github-actions/setup-gcloud from 0.6.2 to 1.0.1 (#12686)
dependabot[bot] Nov 15, 2022
7680c67
Bump github/codeql-action from 2.1.31 to 2.1.32 (#12685)
dependabot[bot] Nov 15, 2022
dae7e5c
Bump core-js from 3.26.0 to 3.26.1 (#12689)
dependabot[bot] Nov 15, 2022
dc16a00
Bump @percy/cli from 1.13.0 to 1.14.0 (#12690)
dependabot[bot] Nov 15, 2022
f9cd950
Bump eslint-plugin-jest-dom from 4.0.2 to 4.0.3 (#12691)
dependabot[bot] Nov 15, 2022
b3d2807
Bump stylelint from 14.14.0 to 14.15.0 (#12692)
dependabot[bot] Nov 15, 2022
6041cb0
Bump @typescript-eslint/eslint-plugin from 5.42.0 to 5.43.0 (#12698)
dependabot[bot] Nov 15, 2022
e61d626
Bump @types/jsdom from 20.0.0 to 20.0.1 (#12696)
dependabot[bot] Nov 15, 2022
15420c0
Bump css-loader from 6.7.1 to 6.7.2 (#12697)
dependabot[bot] Nov 15, 2022
d03a2db
Bump webpack from 5.74.0 to 5.75.0 (#12695)
dependabot[bot] Nov 15, 2022
505e840
Bump slevomat/coding-standard from 8.6.3 to 8.6.4 (#12688)
dependabot[bot] Nov 15, 2022
432e8fc
Fix rollup config and address warnings (#12682)
swissspidy Nov 15, 2022
7550963
Revert "Bump google-github-actions/setup-gcloud from 0.6.2 to 1.0.1 (…
swissspidy Nov 15, 2022
8c33ba9
Bumping npm packages version to v0.1.202211151052
googleforcreators-bot Nov 15, 2022
345495b
Bump puppeteer from 19.0.0 to 19.2.2 (#12694)
dependabot[bot] Nov 15, 2022
62adbd8
Use `google-github-actions/auth`
swissspidy Nov 15, 2022
e8d5991
Update Composer dependencies
swissspidy Nov 16, 2022
91b1f76
Block: Fix stories selector styling issues (#12649)
timarney Nov 17, 2022
b36c905
Wrap components in provider
swissspidy Nov 17, 2022
1570d46
Merge branch 'main' into fix/dashboard-requests
swissspidy Nov 17, 2022
42587d7
Merge branch 'main' into fix/dashboard-requests
swissspidy Nov 18, 2022
898e413
Remove the previous wrapping provider
swissspidy Nov 18, 2022
e457f77
Fix hook name
swissspidy Nov 18, 2022
fe3d5df
Fix jsdoc
swissspidy Nov 18, 2022
560a65c
Fix telemetry banner
swissspidy Nov 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
59 changes: 31 additions & 28 deletions packages/dashboard/src/app/views/exploreTemplates/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import useTemplateFilters from './filters/useTemplateFilters';
import Content from './content';
import Header from './header';
import TemplateDetailsModal from './modal';
import TemplateFiltersProvider from './filters/TemplateFiltersProvider';

function ExploreTemplates() {
const speak = useLiveRegion();
Expand Down Expand Up @@ -258,34 +259,36 @@ function ExploreTemplates() {
}, [orderedTemplates, replace, updateTemplateView]);

return (
<Layout.Provider>
<Header
isLoading={isLoading && !totalTemplates}
totalTemplates={totalVisibleTemplates}
searchOptions={searchOptions}
view={view}
/>
<Content
isLoading={isLoading}
allPagesFetched={allPagesFetched}
page={page}
templates={orderedTemplates}
totalTemplates={totalVisibleTemplates}
search={searchFilterValue}
view={view}
templateActions={templateActions}
/>
<Layout.Fixed>
<ScrollToTop />
</Layout.Fixed>
<TemplateDetailsModal
activeTemplate={activeTemplate}
activeTemplateIndex={activeTemplateIndex}
isDetailsViewOpen={isDetailsViewOpen}
templateActions={templateActions}
filteredTemplatesLength={orderedTemplates.length}
/>
</Layout.Provider>
<TemplateFiltersProvider>
<Layout.Provider>
<Header
isLoading={isLoading && !totalTemplates}
totalTemplates={totalVisibleTemplates}
searchOptions={searchOptions}
view={view}
/>
<Content
isLoading={isLoading}
allPagesFetched={allPagesFetched}
page={page}
templates={orderedTemplates}
totalTemplates={totalVisibleTemplates}
search={searchFilterValue}
view={view}
templateActions={templateActions}
/>
<Layout.Fixed>
<ScrollToTop />
</Layout.Fixed>
<TemplateDetailsModal
activeTemplate={activeTemplate}
activeTemplateIndex={activeTemplateIndex}
isDetailsViewOpen={isDetailsViewOpen}
templateActions={templateActions}
filteredTemplatesLength={orderedTemplates.length}
/>
</Layout.Provider>
</TemplateFiltersProvider>
);
}

Expand Down
38 changes: 0 additions & 38 deletions packages/dashboard/src/app/views/filters/provider.js

This file was deleted.

59 changes: 31 additions & 28 deletions packages/dashboard/src/app/views/myStories/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import useApi from '../../api/useApi';
import useStoryFilters from './filters/useStoryFilters';
import Content from './content';
import Header from './header';
import StoryFiltersProvider from './filters/StoryFiltersProvider';
swissspidy marked this conversation as resolved.
Show resolved Hide resolved

function MyStories() {
const {
Expand Down Expand Up @@ -111,36 +112,38 @@ function MyStories() {
}, [stories, storiesOrderById]);

return (
<Layout.Provider>
<Header
initialPageReady={initialPageReady}
stories={orderedStories}
totalStoriesByStatus={totalStoriesByStatus}
view={view}
/>
<StoryFiltersProvider>
<Layout.Provider>
<Header
initialPageReady={initialPageReady}
stories={orderedStories}
totalStoriesByStatus={totalStoriesByStatus}
view={view}
/>

<Content
allPagesFetched={allPagesFetched}
canViewDefaultTemplates={canViewDefaultTemplates}
filtersObject={filtersObject}
loading={{
isLoading: isLoading,
showStoriesWhileLoading,
}}
page={page}
stories={orderedStories}
storyActions={{
duplicateStory,
trashStory,
updateStory,
}}
view={view}
/>
<Content
allPagesFetched={allPagesFetched}
canViewDefaultTemplates={canViewDefaultTemplates}
filtersObject={filtersObject}
loading={{
isLoading: isLoading,
showStoriesWhileLoading,
}}
page={page}
stories={orderedStories}
storyActions={{
duplicateStory,
trashStory,
updateStory,
}}
view={view}
/>

<Layout.Fixed>
<ScrollToTop />
</Layout.Fixed>
</Layout.Provider>
<Layout.Fixed>
<ScrollToTop />
</Layout.Fixed>
</Layout.Provider>
</StoryFiltersProvider>
);
}

Expand Down
39 changes: 20 additions & 19 deletions packages/dashboard/src/components/interfaceSkeleton/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import { APP_ROUTES, ROUTE_TITLES } from '../../constants';
import { Route, useRouteHistory } from '../../app/router';
import { AppFrame, LeftRail, PageContent } from '../pageStructure';
import useApiAlerts from '../../app/api/useApiAlerts';
import FiltersProvider from '../../app/views/filters/provider';
import useApi from '../../app/api/useApi';
import { useConfig } from '../../app/config';

Expand Down Expand Up @@ -146,26 +145,28 @@ const InterfaceSkeleton = ({ additionalRoutes }) => {
<>
<AppFrame>
<LeftRail />
<FiltersProvider>
<PageContent>
<Route
exact
isDefault
path={APP_ROUTES.DASHBOARD}
component={<MyStoriesView />}
/>
{canViewDefaultTemplates && (
<PageContent>
{availableRoutes.length > 0 && (
<>
<Route
path={APP_ROUTES.TEMPLATES_GALLERY}
component={<ExploreTemplatesView />}
exact
isDefault
path={APP_ROUTES.DASHBOARD}
component={<MyStoriesView />}
/>
)}
{additionalRoutes &&
additionalRoutes.map((routeProps) => (
<Route key={routeProps.path} {...routeProps} />
))}
</PageContent>
</FiltersProvider>
{canViewDefaultTemplates && (
<Route
path={APP_ROUTES.TEMPLATES_GALLERY}
component={<ExploreTemplatesView />}
/>
)}
{additionalRoutes &&
additionalRoutes.map((routeProps) => (
<Route key={routeProps.path} {...routeProps} />
))}
</>
)}
</PageContent>
</AppFrame>
<Snackbar.Container
notifications={currentSnacks}
Expand Down
2 changes: 1 addition & 1 deletion packages/dashboard/src/karma/apiProviderFixture.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ function getStoriesState() {
};
}

function fetchStories({ sort, filters }, currentState) {
function fetchStories({ sort = {}, filters = {} }, currentState) {
const storiesState = currentState ? { ...currentState } : getStoriesState();
const {
author,
Expand Down