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.

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

Seperate user and non-user roles #1006

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
22c4c0a
Seperate user and non-user roles
Arnei Dec 11, 2024
487ce13
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Dec 12, 2024
4c5edf0
Show username in user role dropdown
Arnei Dec 19, 2024
6bc1722
Add view roles for the acl tab
Arnei Dec 19, 2024
f82a89b
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Jan 3, 2025
55f9a27
Fix role
Arnei Jan 17, 2025
3111f52
Remove custom filtering for dropdowns
Arnei Jan 17, 2025
197701c
Dont display acl step if user is missing role
Arnei Jan 17, 2025
aa0a68f
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Jan 23, 2025
007d911
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Jan 31, 2025
90fa698
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Jan 31, 2025
5a3793d
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Feb 5, 2025
5cd6166
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Feb 10, 2025
83747d8
Fix keeping roles on template change not working for multiple prefixes
Arnei Feb 11, 2025
8c556f8
Make use of acl template matching
Arnei Feb 13, 2025
ffbe877
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Feb 17, 2025
f2a7608
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Feb 26, 2025
35b4a93
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Feb 27, 2025
ff95972
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Mar 10, 2025
0143592
Fix wrong roles in acl role dropdowns
Arnei Mar 12, 2025
14c9829
Fix initial role not rendering as a user role
Arnei Mar 17, 2025
fca6357
Remove experimental performance for dropdown
Arnei Mar 18, 2025
813ff1e
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Mar 19, 2025
af12119
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Mar 20, 2025
3fbbc36
Merge branch 'main' into seperate-user-and-non-user-roles
Arnei Mar 20, 2025
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
253 changes: 19 additions & 234 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"@types/lodash": "^4.17.16",
"@types/node": "^22.13.8",
"@types/react-dom": "^19.0.0",
"@types/react-window": "^1.8.8",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@vitejs/plugin-react-swc": "^3.8.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import React from "react";
import { getPolicies } from "../../../../selectors/eventDetailsSelectors";
import { getPolicies, getPolicyTemplateId } from "../../../../selectors/eventDetailsSelectors";
import ResourceDetailsAccessPolicyTab from "../../../shared/modals/ResourceDetailsAccessPolicyTab";
import { useAppSelector } from "../../../../store";
import {
fetchAccessPolicies,
fetchHasActiveTransactions,
saveAccessPolicies,
} from "../../../../slices/eventDetailsSlice";
import { useTranslation } from "react-i18next";
import { ParseKeys } from "i18next";

/**
Expand All @@ -24,21 +23,29 @@ const EventDetailsAccessPolicyTab = ({
policyChanged: boolean,
setPolicyChanged: (value: boolean) => void,
}) => {
const { t } = useTranslation();

const policies = useAppSelector(state => getPolicies(state));
const policyTemplateId = useAppSelector(state => getPolicyTemplateId(state));

return (
<ResourceDetailsAccessPolicyTab
resourceId={eventId}
header={header}
buttonText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.LABEL"}
policies={policies}
policyTemplateId={policyTemplateId}
fetchAccessPolicies={fetchAccessPolicies}
fetchHasActiveTransactions={fetchHasActiveTransactions}
saveNewAccessPolicies={saveAccessPolicies}
descriptionText={t("EVENTS.SERIES.NEW.ACCESS.ACCESS_POLICY.DESCRIPTION")}
descriptionText={"EVENTS.SERIES.NEW.ACCESS.ACCESS_POLICY.DESCRIPTION"}
policyTableHeaderText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.DETAILS"}
policyTableRoleText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.ROLE"}
policyTableNewText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.NEW"}
userPolicyTableHeaderText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.USERS"}
userPolicyTableRoleText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.USER"}
userPolicyTableNewText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.NEW_USER"}
editAccessRole={"ROLE_UI_EVENTS_DETAILS_ACL_EDIT"}
viewUsersAccessRole={"ROLE_UI_EVENTS_DETAILS_ACL_USER_ROLES_VIEW"}
viewNonUsersAccessRole={"ROLE_UI_EVENTS_DETAILS_ACL_NONUSER_ROLES_VIEW"}
policyChanged={policyChanged}
setPolicyChanged={setPolicyChanged}
/>
Expand Down
Loading
Loading