Skip to content

Commit 596a436

Browse files
committed
Revert "Merge branch 'seperate-user-and-non-user-roles' of Arnei/opencast-admin-interface into main"
This reverts commit 01801c8, reversing changes made to 6ac49a4.
1 parent b407beb commit 596a436

27 files changed

Lines changed: 3368 additions & 1260 deletions

package-lock.json

Lines changed: 2355 additions & 341 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"@types/lodash": "^4.17.16",
6666
"@types/node": "^22.15.18",
6767
"@types/react-dom": "^19.1.5",
68-
"@types/react-window": "^1.8.8",
6968
"@types/uuid": "^10.0.0",
7069
"@vitejs/plugin-react-swc": "^3.9.0",
7170
"eslint": "^9.26.0",

src/components/events/partials/ModalTabsAndPages/EventDetailsAccessPolicyTab.tsx

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import React from "react";
2-
import { getPolicies, getPolicyTemplateId } from "../../../../selectors/eventDetailsSelectors";
2+
import { getPolicies } from "../../../../selectors/eventDetailsSelectors";
33
import ResourceDetailsAccessPolicyTab from "../../../shared/modals/ResourceDetailsAccessPolicyTab";
44
import { useAppSelector } from "../../../../store";
55
import {
66
fetchAccessPolicies,
77
fetchHasActiveTransactions,
88
saveAccessPolicies,
99
} from "../../../../slices/eventDetailsSlice";
10+
import { useTranslation } from "react-i18next";
1011
import { ParseKeys } from "i18next";
1112

1213
/**
@@ -23,29 +24,21 @@ const EventDetailsAccessPolicyTab = ({
2324
policyChanged: boolean,
2425
setPolicyChanged: (value: boolean) => void,
2526
}) => {
27+
const { t } = useTranslation();
28+
2629
const policies = useAppSelector(state => getPolicies(state));
27-
const policyTemplateId = useAppSelector(state => getPolicyTemplateId(state));
2830

2931
return (
3032
<ResourceDetailsAccessPolicyTab
3133
resourceId={eventId}
3234
header={header}
3335
buttonText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.LABEL"}
3436
policies={policies}
35-
policyTemplateId={policyTemplateId}
3637
fetchAccessPolicies={fetchAccessPolicies}
3738
fetchHasActiveTransactions={fetchHasActiveTransactions}
3839
saveNewAccessPolicies={saveAccessPolicies}
39-
descriptionText={"EVENTS.SERIES.NEW.ACCESS.ACCESS_POLICY.DESCRIPTION"}
40-
policyTableHeaderText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.NON_USER_ROLES"}
41-
policyTableRoleText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.ROLE"}
42-
policyTableNewText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.NEW"}
43-
userPolicyTableHeaderText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.USERS"}
44-
userPolicyTableRoleText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.USER"}
45-
userPolicyTableNewText={"EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.NEW_USER"}
40+
descriptionText={t("EVENTS.SERIES.NEW.ACCESS.ACCESS_POLICY.DESCRIPTION")}
4641
editAccessRole={"ROLE_UI_EVENTS_DETAILS_ACL_EDIT"}
47-
viewUsersAccessRole={"ROLE_UI_EVENTS_DETAILS_ACL_USER_ROLES_VIEW"}
48-
viewNonUsersAccessRole={"ROLE_UI_EVENTS_DETAILS_ACL_NONUSER_ROLES_VIEW"}
4942
policyChanged={policyChanged}
5043
setPolicyChanged={setPolicyChanged}
5144
/>

0 commit comments

Comments
 (0)