diff --git a/src/common/CreateTaskDialog.jsx b/src/common/CreateTaskDialog.jsx index 8941638d..55668335 100644 --- a/src/common/CreateTaskDialog.jsx +++ b/src/common/CreateTaskDialog.jsx @@ -62,7 +62,7 @@ const CreateTaskDialog = ({ (state) => state.getSupportedLanguages.voiceoverLanguage ); const bulkTaskTypes = useSelector((state) => state.getBulkTaskTypes.data); - +const[langLabel,setlabel] =useState("") const [taskType, setTaskType] = useState(""); const [description, setDescription] = useState(""); const [user, setUser] = useState(""); @@ -72,7 +72,6 @@ const CreateTaskDialog = ({ const [allowedTaskType, setAllowedTaskType] = useState(""); const [showAllowedTaskList, setShowAllowedTaskList] = useState(false); const [showLimitWarning, setShowLimitWarning] = useState(false); - useEffect(() => { const taskObj = new FetchTaskTypeAPI(); dispatch(APITransport(taskObj)); @@ -147,8 +146,13 @@ const CreateTaskDialog = ({ const { target: { value }, } = event; - + const selectedLanguage = translationLanguage.find( + (lang) => lang.value === event.target.value + ) || voiceoverLanguage.find( + (lang) => lang.value === event.target.value + ); setLanguage(value); + setlabel(selectedLanguage.label) if (isBulk) { const obj = new FetchProjectMembersAPI(projectId, taskType, "", value); @@ -367,12 +371,14 @@ const CreateTaskDialog = ({ inputProps={{ "aria-label": "Without label" }} disabled={isAssignUserDropdownDisabled()} > - {projectMembers.map((item, index) => ( + {projectMembers + .filter((member) => member.languages.includes(langLabel)) + .map((item, index) => ( {`${item.first_name} ${item.last_name} (${item.email})`} ))} - + diff --git a/src/containers/Organization/MyOrganization.jsx b/src/containers/Organization/MyOrganization.jsx index 0984ef40..001252c5 100644 --- a/src/containers/Organization/MyOrganization.jsx +++ b/src/containers/Organization/MyOrganization.jsx @@ -71,6 +71,7 @@ const MyOrganization = () => { const [orgOwnerId, setOrgOwnerId] = useState(""); const [openUploadBulkVideoDialog, setOpenUploadBulkVideoDialog] = useState(false); + const [isUserOrgOwner, setIsUserOrgOwner] = useState(false); const organizationDetails = useSelector( (state) => state.getOrganizationDetails.data @@ -135,10 +136,19 @@ const MyOrganization = () => { if (userData && userData.id) { const { - organization: { organization_owner }, + organization: { organization_owners }, } = userData; - - setOrgOwnerId(organization_owner.id); + + if (organization_owners && organization_owners?.length > 0) { + const ownerIds = organization_owners.map(owner => owner.id); + setOrgOwnerId(ownerIds); + + if (ownerIds.includes(userData.id)) { + setIsUserOrgOwner(true); + } else { + setIsUserOrgOwner(false); + } + } } // eslint-disable-next-line }, [userData]); @@ -195,11 +205,11 @@ const MyOrganization = () => { )} - {userData?.id === orgOwnerId && ( + {isUserOrgOwner&& ( )} - {userData?.id === orgOwnerId && ( + {isUserOrgOwner && ( { alignItems="center" > - {userData?.id === orgOwnerId && ( + {isUserOrgOwner && ( - {(loggedInUserData.id === orgOwnerId || + {(isUserOrgOwner || loggedInUserData.role === "PROJECT_MANAGER") && (