Merge remote-tracking branch 'upstream/main' into fix-clean-metadata

Resolved conflicts in package.json and package-lock.json
Updated to latest dependencies from upstream

Author: priya-tik

package-lock.json

@@ -65,6 +65,7 @@
     "@types/lodash": "^4.17.16",
     "@types/node": "^22.15.18",
     "@types/react-dom": "^19.1.5",
+    "@types/react-window": "^1.8.8",
     "@types/uuid": "^10.0.0",
     "@vitejs/plugin-react-swc": "^3.9.0",
     "eslint": "^9.26.0",

package.json

@@ -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";
 
 /**
@@ -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.NON_USER_ROLES"}
+			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}
 		/>