djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staff member cannot chnge its own settings (#2968)

Browse source
This commit is contained in:
Patryk Andrzejewski 2023-01-17 09:51:18 +01:00 committed by GitHub
parent b723e05b2f
commit 53806abc10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/index.tsx
View file

@ -221,11 +221,7 @@ const Routes: React.FC = () => {
path="/product-types"
component={ProductTypesSection}
/>
<SectionRoute
permissions={[PermissionEnum.MANAGE_STAFF]}
path="/staff"
component={StaffSection}
/>
<SectionRoute path="/staff" component={StaffSection} />
<SectionRoute
permissions={[PermissionEnum.MANAGE_STAFF]}
path="/permission-groups"

3
src/staff/components/StaffPasswordResetDialog/StaffPasswordResetDialog.tsx
View file

@ -60,7 +60,7 @@ const StaffPasswordResetDialog: React.FC<StaffPasswordResetDialogProps> = ({
/>
</DialogTitle>
<Form initial={initialForm} onSubmit={onSubmit}>
{({ change, data, submit }) => (
{({ change, data }) => (
<>
<DialogContent>
<TextField
@ -114,7 +114,6 @@ const StaffPasswordResetDialog: React.FC<StaffPasswordResetDialogProps> = ({
disabled={data.newPassword.length < 8}
transitionState={confirmButtonState}
type="submit"
onClick={submit}
>
<FormattedMessage {...buttonMessages.save} />
</ConfirmButton>

13
src/staff/views/StaffDetails.tsx
View file

@ -1,9 +1,11 @@
import { useUser } from "@dashboard/auth";
import ActionDialog from "@dashboard/components/ActionDialog";
import NotFoundPage from "@dashboard/components/NotFoundPage";
import { hasPermissions } from "@dashboard/components/RequirePermissions";
import { WindowTitle } from "@dashboard/components/WindowTitle";
import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config";
import {
PermissionEnum,
useChangeStaffPasswordMutation,
useStaffAvatarDeleteMutation,
useStaffAvatarUpdateMutation,
@ -64,6 +66,9 @@ export const StaffDetails: React.FC<OrderListProps> = ({ id, params }) => {
});
const staffMember = isUserSameAsViewer ? user.user : data?.user;
const hasManageStaffPermission = hasPermissions(user.user.userPermissions, [
PermissionEnum.MANAGE_STAFF,
]);
const [changePassword, changePasswordOpts] = useChangeStaffPasswordMutation({
onCompleted: data => {
@ -83,6 +88,7 @@ export const StaffDetails: React.FC<OrderListProps> = ({ id, params }) => {
result: searchPermissionGroupsOpts,
} = usePermissionGroupSearch({
variables: DEFAULT_INITIAL_SEARCH_DATA,
skip: !hasManageStaffPermission,
});
const [
@ -156,7 +162,9 @@ export const StaffDetails: React.FC<OrderListProps> = ({ id, params }) => {
firstName: formData.firstName,
isActive: formData.isActive,
lastName: formData.lastName,
...groupsDiff(data?.user, formData),
...(hasManageStaffPermission
? groupsDiff(data?.user, formData)
: {}),
},
},
}),
@ -208,7 +216,8 @@ export const StaffDetails: React.FC<OrderListProps> = ({ id, params }) => {
staffMember={staffMember}
saveButtonBarState={updateStaffMemberOpts.status}
fetchMorePermissionGroups={{
hasMore: searchPermissionGroupsOpts.data?.search.pageInfo.hasNextPage,
hasMore:
searchPermissionGroupsOpts.data?.search?.pageInfo.hasNextPage,
loading: searchPermissionGroupsOpts.loading,
onFetchMore: loadMorePermissionGroups,
}}