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.

Sign up for GitHub

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

Jump to bottom

fix(content-manager): return default locale #20237

Draft
wants to merge 10 commits into
base: develop
Choose a base branch
from
+5 −2
Draft

fix(content-manager): return default locale #20237

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
57a048b
feat: add key to reset injection zone states
yurimutti Apr 30, 2024
ecbd858
feat: add key to reset injection zone states
yurimutti Apr 30, 2024
6db607e
feat: add key to reset injection zone states
yurimutti Apr 30, 2024
5ee8da2
feat: add key to reset injection zone states
yurimutti Apr 30, 2024
8a70fb3
feat: add key to reset injection zone states
yurimutti Apr 30, 2024
034103c
feat: add key to reset injection zone states
yurimutti Apr 30, 2024
5b84f9c
feat: add key to reset injection zone states
yurimutti Apr 30, 2024
b755b5a
feat: add key to reset injection zone states
yurimutti Apr 30, 2024
7cbc251
feat: add key to reset injection zone states
yurimutti Apr 30, 2024
4d97217
Merge branch 'develop' into fix/return-default-locale
yurimutti May 3, 2024
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
7 changes: 5 additions & 2 deletions packages/core/admin/admin/src/content-manager/pages/ListView/ListViewPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ const ListViewPage = ({
useFocusWhenNavigate();

const params = React.useMemo(() => buildValidGetParams(query), [query]);

const pluginsQueryParams = stringify({ plugins: query.plugins }, { encode: false });

const displayedAttributeFilters = allowedAttributes.map((name) => {
Expand Down Expand Up @@ -604,13 +605,15 @@ const ListViewPage = ({
}
/>
{!canRead && (
<ActionLayout endActions={<InjectionZone area="contentManager.listView.actions" />} />
<ActionLayout
endActions={<InjectionZone area="contentManager.listView.actions" key={params.locale} />}
/>
)}
{canRead && (
<ActionLayout
endActions={
<>
<InjectionZone area="contentManager.listView.actions" />
<InjectionZone area="contentManager.listView.actions" key={params.locale} />
<ViewSettingsMenu slug={slug} />
</>
}
Expand Down