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

fix: folder and content creation permission checks #4548

Merged
merged 1 commit into from
Feb 20, 2025
+34 −22
Merged

fix: folder and content creation permission checks #4548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions packages/app-headless-cms/src/admin/views/contentEntries/Table/Main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
import React, { useCallback, useEffect, useRef, useState } from "react";
import debounce from "lodash/debounce";
import { useCreateDialog, useGetFolderLevelPermission } from "@webiny/app-aco";
import { Scrollbar } from "@webiny/ui/Scrollbar";
Expand Down Expand Up @@ -35,13 +35,19 @@ export const Main = ({ folderId: initialFolderId }: MainProps) => {
const { getFolderLevelPermission: canManageStructure } =
useGetFolderLevelPermission("canManageStructure");

const canCreateFolder = useMemo(() => {
return canManageStructure(folderId);
}, [canManageStructure, folderId]);
const canCreateFolder = useCallback(
(folderId: string) => {
return canManageStructure(folderId);
},
[canManageStructure]
);

const canCreateContent = useMemo(() => {
return canCreate && canManageContent(folderId);
}, [canManageContent, folderId]);
const canCreateContent = useCallback(
(folderId: string) => {
return canCreate && canManageContent(folderId);
},
[canManageContent, canCreate]
);

const createEntry = useCallback(() => {
const folder = folderId ? `&folderId=${encodeURIComponent(folderId)}` : "";
Expand Down Expand Up @@ -81,8 +87,8 @@ export const Main = ({ folderId: initialFolderId }: MainProps) => {
<MainContainer>
<Header
title={!list.isListLoading ? list.listTitle : undefined}
canCreateFolder={canCreateFolder}
canCreateContent={canCreateContent}
canCreateFolder={canCreateFolder(folderId)}
canCreateContent={canCreateContent(folderId)}
onCreateEntry={createEntry}
onCreateFolder={onCreateFolder}
searchValue={list.search}
Expand All @@ -97,8 +103,8 @@ export const Main = ({ folderId: initialFolderId }: MainProps) => {
!list.isListLoading ? (
<Empty
isSearch={list.isSearch}
canCreateFolder={canCreateFolder}
canCreateContent={canCreateContent}
canCreateFolder={canCreateFolder(folderId)}
canCreateContent={canCreateContent(folderId)}
onCreateEntry={createEntry}
onCreateFolder={onCreateFolder}
/>
Expand Down
28 changes: 17 additions & 11 deletions packages/app-page-builder/src/admin/views/Pages/Table/Main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
import React, { useCallback, useEffect, useRef, useState } from "react";
import debounce from "lodash/debounce";
import { i18n } from "@webiny/app/i18n";
import { useCreateDialog, useGetFolderLevelPermission } from "@webiny/app-aco";
Expand Down Expand Up @@ -51,13 +51,19 @@ export const Main = ({ folderId: initialFolderId }: Props) => {
const { getFolderLevelPermission: canManageContent } =
useGetFolderLevelPermission("canManageContent");

const canCreateFolder = useMemo(() => {
return canManageStructure(folderId);
}, [canManageStructure, folderId]);
const canCreateFolder = useCallback(
(folderId: string) => {
return canManageStructure(folderId);
},
[canManageStructure]
);

const canCreateContent = useMemo(() => {
return canCreate() && canManageContent(folderId);
}, [canManageContent, folderId]);
const canCreateContent = useCallback(
(folderId: string) => {
return canCreate() && canManageContent(folderId);
},
[canManageContent, canCreate]
);

const { innerHeight: windowHeight } = window;
const [tableHeight, setTableHeight] = useState(0);
Expand Down Expand Up @@ -100,8 +106,8 @@ export const Main = ({ folderId: initialFolderId }: Props) => {
<MainContainer>
<Header
title={!list.isListLoading ? list.listTitle : undefined}
canCreateFolder={canCreateFolder}
canCreateContent={canCreateContent}
canCreateFolder={canCreateFolder(folderId)}
canCreateContent={canCreateContent(folderId)}
onCreatePage={openTemplatesDialog}
onImportPage={openCategoriesDialog}
onCreateFolder={onCreateFolder}
Expand All @@ -116,8 +122,8 @@ export const Main = ({ folderId: initialFolderId }: Props) => {
!list.isListLoading ? (
<Empty
isSearch={list.isSearch}
canCreateFolder={canCreateFolder}
canCreateContent={canCreateContent}
canCreateFolder={canCreateFolder(folderId)}
canCreateContent={canCreateContent(folderId)}
onCreatePage={openTemplatesDialog}
onCreateFolder={onCreateFolder}
/>
Expand Down