diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json index d6c7fa689..c922273b7 100644 --- a/locale/defaultMessages.json +++ b/locale/defaultMessages.json @@ -958,10 +958,6 @@ "context": "translations section name", "string": "Translations" }, - "5ftg/B": { - "context": "button", - "string": "create permission group" - }, "5kvaFR": { "context": "product field", "string": "Export Variant SKU" @@ -5017,6 +5013,10 @@ "context": "product type", "string": "Product Type" }, + "bRJD/v": { + "context": "button", + "string": "Create permission group" + }, "bS7A8u": { "context": "add tracking button", "string": "Add tracking" diff --git a/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.stories.tsx b/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.stories.tsx index 0e872f43b..50d188d7b 100644 --- a/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.stories.tsx +++ b/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.stories.tsx @@ -16,7 +16,6 @@ const props: PermissionGroupDetailsPageProps = { errors: [], isChecked: () => false, members: users, - membersModified: false, onAssign: () => undefined, onSort: () => undefined, onSubmit: () => undefined, diff --git a/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.tsx b/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.tsx index 580118077..e4faa06cd 100644 --- a/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.tsx +++ b/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.tsx @@ -53,7 +53,6 @@ export interface PermissionGroupDetailsPageProps disabled: boolean; errors: PermissionGroupErrorFragment[]; members: PermissionGroupDetailsFragment["users"]; - membersModified: boolean; permissionGroup: PermissionGroupDetailsFragment; permissions: PermissionData[]; permissionsExceeded: boolean; @@ -67,7 +66,6 @@ const PermissionGroupDetailsPage: React.FC = ({ disabled, errors, members, - membersModified, onSubmit, permissionGroup, permissions, @@ -143,7 +141,7 @@ const PermissionGroupDetailsPage: React.FC = ({ onCancel={() => navigate(permissionGroupListUrl())} onSubmit={submit} state={saveButtonBarState} - disabled={disabled || !membersModified} + disabled={disabled} /> diff --git a/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.tsx b/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.tsx index 4ac699122..02006129e 100644 --- a/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.tsx +++ b/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.tsx @@ -38,8 +38,8 @@ const PermissionGroupListPage: React.FC = listProp data-test-id="create-permission-group" > diff --git a/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx b/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx index b1f388224..7cf5d0e4f 100644 --- a/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx +++ b/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx @@ -110,7 +110,7 @@ const PermissionGroupMemberList: React.FC = props => { const classes = useStyles(props); const intl = useIntl(); - const members = users?.sort(sortMembers(sort?.sort, sort?.asc)); + const members = [...users].sort(sortMembers(sort?.sort, sort?.asc)); return ( diff --git a/src/permissionGroups/views/PermissionGroupDetails/PermissionGroupDetails.tsx b/src/permissionGroups/views/PermissionGroupDetails/PermissionGroupDetails.tsx index 728e05687..d1a5ba99a 100644 --- a/src/permissionGroups/views/PermissionGroupDetails/PermissionGroupDetails.tsx +++ b/src/permissionGroups/views/PermissionGroupDetails/PermissionGroupDetails.tsx @@ -23,7 +23,7 @@ import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandl import createSortHandler from "@saleor/utils/handlers/sortHandler"; import { mapEdgesToItems } from "@saleor/utils/maps"; import { getSortParams } from "@saleor/utils/sort"; -import React, { useState } from "react"; +import React from "react"; import { useIntl } from "react-intl"; import AssignMembersDialog from "../../components/AssignMembersDialog"; @@ -61,8 +61,6 @@ export const PermissionGroupDetails: React.FC = ({ data?.permissionGroup.users, ); - const [membersModified, setMembersModified] = useState(false); - const { search, result: searchResult, loadMore } = useStaffMemberSearch({ variables: DEFAULT_INITIAL_SEARCH_DATA, }); @@ -104,7 +102,6 @@ export const PermissionGroupDetails: React.FC = ({ const unassignMembers = () => { setMembersList(membersList?.filter(m => !listElements.includes(m.id))); - setMembersModified(true); closeModal(); }; @@ -153,7 +150,6 @@ export const PermissionGroupDetails: React.FC = ({ permissionGroup={data?.permissionGroup} permissionsExceeded={permissionsExceeded} members={membersList || []} - membersModified={membersModified} onAssign={() => openModal("assign")} onUnassign={ids => openModal("unassign", { ids })} errors={ @@ -198,7 +194,6 @@ export const PermissionGroupDetails: React.FC = ({ ...membersList, ...formData.filter(member => !membersList.includes(member)), ]); - setMembersModified(true); closeModal(); }} /> diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap index 78fd78144..07b6bfcf8 100644 --- a/src/storybook/__snapshots__/Stories.test.ts.snap +++ b/src/storybook/__snapshots__/Stories.test.ts.snap @@ -168311,7 +168311,7 @@ exports[`Storyshots Views / Permission Groups / Permission Group List default 1` - create permission group + Create permission group @@ -168754,7 +168754,7 @@ exports[`Storyshots Views / Permission Groups / Permission Group List loading 1` - create permission group + Create permission group @@ -168974,7 +168974,7 @@ exports[`Storyshots Views / Permission Groups / Permission Group List no data 1` - create permission group + Create permission group