Skip to content

Do not filter selected role from ACL dropdown #1499

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

Open
Arnei wants to merge 1 commit into
base: r/19.x
Choose a base branch
from
Open

Do not filter selected role from ACL dropdown #1499

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
8 changes: 4 additions & 4 deletions src/components/events/partials/ModalTabsAndPages/NewAccessPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
fetchRolesWithTarget,
} from "../../../../slices/aclSlice";
import { FormikProps } from "formik";
import { filterRoles, policiesFiltered, rolesFilteredbyPolicies } from "../../../../utils/aclUtils";
import { policiesFiltered, rolesFiltered } from "../../../../utils/aclUtils";
import { useAppDispatch, useAppSelector } from "../../../../store";
import { fetchSeriesDetailsAcls } from "../../../../slices/seriesDetailsSlice";
import { getSeriesDetailsAcl } from "../../../../selectors/seriesDetailsSelectors";
Expand Down Expand Up @@ -122,7 +122,7 @@ const NewAccessPage = <T extends RequiredFormProps>({
<AccessPolicyTable
isUserTable={true}
policiesFiltered={policiesFiltered(formik.values.policies, true)}
rolesFilteredbyPolicies={rolesFilteredbyPolicies(roles, formik.values.policies, true)}
rolesFilteredbyPolicies={rolesFiltered(roles, true)}
header={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.USERS"}
firstColumnHeader={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.USER"}
createLabel={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.NEW_USER"}
Expand All @@ -139,7 +139,7 @@ const NewAccessPage = <T extends RequiredFormProps>({
<AccessPolicyTable
isUserTable={false}
policiesFiltered={policiesFiltered(formik.values.policies, false)}
rolesFilteredbyPolicies={rolesFilteredbyPolicies(roles, formik.values.policies, false)}
rolesFilteredbyPolicies={rolesFiltered(roles, false)}
header={"USERS.ACLS.NEW.ACCESS.ACCESS_POLICY.NON_USER_ROLES"}
firstColumnHeader={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.ROLE"}
createLabel={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.NEW"}
Expand All @@ -159,7 +159,7 @@ const NewAccessPage = <T extends RequiredFormProps>({
<AccessPolicyTable
isUserTable={false}
policiesFiltered={formik.values.policies}
rolesFilteredbyPolicies={filterRoles(roles, formik.values.policies)}
rolesFilteredbyPolicies={roles}
firstColumnHeader={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.ROLE"}
createLabel={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.NEW"}
formik={formik}
Expand Down
8 changes: 4 additions & 4 deletions src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
import { getUserInformation } from "../../../selectors/userInfoSelectors";
import { hasAccess } from "../../../utils/utils";
import DropDown from "../DropDown";
import { filterRoles, getAclTemplateText, handleTemplateChange, policiesFiltered, rolesFilteredbyPolicies } from "../../../utils/aclUtils";
import { getAclTemplateText, handleTemplateChange, policiesFiltered, rolesFiltered } from "../../../utils/aclUtils";
import { useAppDispatch, useAppSelector } from "../../../store";
import { removeNotificationWizardForm, addNotification } from "../../../slices/notificationSlice";
import { useTranslation } from "react-i18next";
Expand Down Expand Up @@ -311,7 +311,7 @@ const ResourceDetailsAccessPolicyTab = ({
<AccessPolicyTable
isUserTable={true}
policiesFiltered={policiesFiltered(formik.values.policies, true)}
rolesFilteredbyPolicies={rolesFilteredbyPolicies(roles, formik.values.policies, true)}
rolesFilteredbyPolicies={rolesFiltered(roles, true)}
header={userPolicyTableHeaderText}
firstColumnHeader={userPolicyTableRoleText}
createLabel={userPolicyTableNewText}
Expand All @@ -328,7 +328,7 @@ const ResourceDetailsAccessPolicyTab = ({
<AccessPolicyTable
isUserTable={false}
policiesFiltered={policiesFiltered(formik.values.policies, false)}
rolesFilteredbyPolicies={rolesFilteredbyPolicies(roles, formik.values.policies, false)}
rolesFilteredbyPolicies={rolesFiltered(roles, false)}
header={policyTableHeaderText}
firstColumnHeader={policyTableRoleText}
createLabel={policyTableNewText}
Expand All @@ -348,7 +348,7 @@ const ResourceDetailsAccessPolicyTab = ({
<AccessPolicyTable
isUserTable={false}
policiesFiltered={formik.values.policies}
rolesFilteredbyPolicies={filterRoles(roles, formik.values.policies)}
rolesFilteredbyPolicies={roles}
header={policyTableHeaderText}
firstColumnHeader={policyTableRoleText}
createLabel={policyTableNewText}
Expand Down
8 changes: 4 additions & 4 deletions src/components/users/partials/wizard/AclAccessPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
fetchAclTemplates,
fetchRolesWithTarget,
} from "../../../../slices/aclSlice";
import { filterRoles, policiesFiltered, rolesFilteredbyPolicies } from "../../../../utils/aclUtils";
import { policiesFiltered, rolesFiltered } from "../../../../utils/aclUtils";
import { useAppDispatch } from "../../../../store";
import { TransformedAcl } from "../../../../slices/aclDetailsSlice";
import { AccessPolicyTable, TemplateSelector } from "../../../shared/modals/ResourceDetailsAccessPolicyTab";
Expand Down Expand Up @@ -88,7 +88,7 @@ const AclAccessPage = <T extends RequiredFormProps>({
<AccessPolicyTable
isUserTable={true}
policiesFiltered={policiesFiltered(formik.values.policies, true)}
rolesFilteredbyPolicies={rolesFilteredbyPolicies(roles, formik.values.policies, true)}
rolesFilteredbyPolicies={rolesFiltered(roles, true)}
header={"USERS.ACLS.NEW.ACCESS.ACCESS_POLICY.USERS"}
firstColumnHeader={"USERS.ACLS.NEW.ACCESS.ACCESS_POLICY.USER"}
createLabel={"USERS.ACLS.NEW.ACCESS.ACCESS_POLICY.NEW_USER"}
Expand All @@ -103,7 +103,7 @@ const AclAccessPage = <T extends RequiredFormProps>({
<AccessPolicyTable
isUserTable={false}
policiesFiltered={policiesFiltered(formik.values.policies, false)}
rolesFilteredbyPolicies={rolesFilteredbyPolicies(roles, formik.values.policies, false)}
rolesFilteredbyPolicies={rolesFiltered(roles, false)}
header={"USERS.ACLS.NEW.ACCESS.ACCESS_POLICY.NON_USER_ROLES"}
firstColumnHeader={"USERS.ACLS.NEW.ACCESS.ACCESS_POLICY.ROLE"}
createLabel={"USERS.ACLS.NEW.ACCESS.ACCESS_POLICY.NEW"}
Expand All @@ -122,7 +122,7 @@ const AclAccessPage = <T extends RequiredFormProps>({
<AccessPolicyTable
isUserTable={false}
policiesFiltered={formik.values.policies}
rolesFilteredbyPolicies={filterRoles(roles, formik.values.policies)}
rolesFilteredbyPolicies={roles}
firstColumnHeader={"USERS.ACLS.NEW.ACCESS.ACCESS_POLICY.ROLE"}
createLabel={"USERS.ACLS.NEW.ACCESS.ACCESS_POLICY.NEW"}
formik={formik}
Expand Down
14 changes: 3 additions & 11 deletions src/utils/aclUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ export const getAclTemplateText = (
}
};

export const filterRoles = (roles: Role[], policies: TransformedAcl[]) => {
return roles.filter(
role => !policies.find(policy => policy.role === role.name),
);
};

// Get all policies that have user information, or all policies that do not have user information
export const policiesFiltered = (
policies: TransformedAcl[],
Expand All @@ -43,12 +37,10 @@ export const policiesFiltered = (
};

// Get all roles that have user information, or all policies that do not have user information
export const rolesFilteredbyPolicies = (
roles: Role[],
policies: TransformedAcl[],
byUser: boolean,
export const rolesFiltered = (
roles: Role[],
byUser: boolean,
) => {
roles = filterRoles(roles, policies);
if (byUser) {
return roles.filter(role => role.user !== undefined);
} else {
Expand Down