Skip to content

Commit

Permalink
367 Merge 'Seperate user and non-user' into main (PR 1006)
Browse files Browse the repository at this point in the history
  • Loading branch information
marwyg committed Jan 14, 2025
2 parents 8aaad4f + f82a89b commit 8d4ef64
Show file tree
Hide file tree
Showing 26 changed files with 912 additions and 1,470 deletions.
593 changes: 46 additions & 547 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"react-redux": "^9.2.0",
"react-router-dom": "^6.27.0",
"react-select": "^5.8.0",
"react-window": "^1.8.10",
"redux": "^5.0.1",
"redux-persist": "^6.0.0",
"redux-thunk": "^3.1.0",
Expand Down Expand Up @@ -69,6 +70,7 @@
"@types/lodash": "^4.17.13",
"@types/node": "^22.5.1",
"@types/react-dom": "^18.3.0",
"@types/react-window": "^1.8.8",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@vitejs/plugin-react-swc": "^3.7.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,15 @@ const EventDetailsAccessPolicyTab = ({
fetchHasActiveTransactions={fetchHasActiveTransactions}
saveNewAccessPolicies={saveAccessPolicies}
descriptionText={t("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

0 comments on commit 8d4ef64

Please sign in to comment.