Page MenuHomePhabricator
Files F3383044

D11206.diff
No OneTemporary
Actions

D11206.diff
View Options

diff --git a/web/roles/role-actions-menu.react.js b/web/roles/role-actions-menu.react.js
--- a/web/roles/role-actions-menu.react.js
+++ b/web/roles/role-actions-menu.react.js
@@ -9,7 +9,11 @@
roleIsDefaultRole,
useRoleUserSurfacedPermissions,
} from 'lib/shared/thread-utils.js';
-import type { ThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';
+import type {
+ RoleInfo,
+ ThreadInfo,
+} from 'lib/types/minimally-encoded-thread-permissions-types.js';
+import { values } from 'lib/utils/objects.js';
import { useRoleDeletableAndEditableStatus } from 'lib/utils/role-utils.js';
import CreateRolesModal from './create-roles-modal.react.js';
@@ -34,15 +38,15 @@
);
invariant(defaultRoleID, 'default role should exist');
- const existingRoleID = Object.keys(threadInfo.roles).find(
- roleID => threadInfo.roles[roleID].name === roleName,
+ const existingRole = values(threadInfo.roles).find(
+ (role: RoleInfo) => role.name === roleName,
);
- invariant(existingRoleID, 'existing role should exist');
+ invariant(existingRole, 'existing role should exist');
const roleOptions = useRoleDeletableAndEditableStatus(
roleName,
defaultRoleID,
- existingRoleID,
+ existingRole.id,
);
const roleNamesToUserSurfacedPermissions =
@@ -54,13 +58,13 @@
<CreateRolesModal
threadInfo={threadInfo}
action="edit_role"
- existingRoleID={existingRoleID}
+ existingRoleID={existingRole.id}
roleName={roleName}
rolePermissions={roleNamesToUserSurfacedPermissions[roleName]}
/>,
),
[
- existingRoleID,
+ existingRole.id,
pushModal,
roleName,
roleNamesToUserSurfacedPermissions,
@@ -72,10 +76,10 @@
<DeleteRoleModal
threadInfo={threadInfo}
defaultRoleID={defaultRoleID}
- roleID={existingRoleID}
+ roleID={existingRole.id}
/>,
);
- }, [existingRoleID, pushModal, threadInfo, defaultRoleID]);
+ }, [pushModal, threadInfo, defaultRoleID, existingRole.id]);
const menuItems = React.useMemo(() => {
const availableOptions = [];

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 29, 1:13 PM (21 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2597101
Default Alt Text
D11206.diff (2 KB)

Event Timeline