fix: removing-all-members-toggle-for-fh (#19277)
* fix : removing all members toggle for fh * ux enhancements * adding placeholder
This commit is contained in:
@@ -274,16 +274,15 @@ export function AddMembersWithSwitch({
|
||||
case AssignmentState.TEAM_MEMBERS_IN_SEGMENT_ENABLED:
|
||||
return (
|
||||
<>
|
||||
<AssignAllTeamMembers
|
||||
assignAllTeamMembers={assignAllTeamMembers}
|
||||
setAssignAllTeamMembers={setAssignAllTeamMembers}
|
||||
onActive={() => {
|
||||
onActive();
|
||||
}}
|
||||
onInactive={onAssignAllTeamMembersInactive}
|
||||
customClassNames={customClassNames?.assingAllTeamMembers}
|
||||
/>
|
||||
|
||||
{!isFixed && (
|
||||
<AssignAllTeamMembers
|
||||
assignAllTeamMembers={assignAllTeamMembers}
|
||||
setAssignAllTeamMembers={setAssignAllTeamMembers}
|
||||
onActive={onActive}
|
||||
onInactive={onAssignAllTeamMembersInactive}
|
||||
customClassNames={customClassNames?.assingAllTeamMembers}
|
||||
/>
|
||||
)}
|
||||
{assignmentState !== AssignmentState.ALL_TEAM_MEMBERS_ENABLED_AND_SEGMENT_NOT_APPLICABLE && (
|
||||
<div className="mt-2">
|
||||
<MembersSegmentWithToggle
|
||||
|
||||
@@ -210,7 +210,8 @@ const FixedHosts = ({
|
||||
toggleSwitchAtTheEnd={true}
|
||||
title={t("fixed_hosts")}
|
||||
description={FixedHostHelper}
|
||||
checked={isDisabled}
|
||||
checked={isDisabled && !assignAllTeamMembers}
|
||||
hideSwitch={assignAllTeamMembers}
|
||||
labelClassName={classNames("text-sm", customClassNames?.label)}
|
||||
descriptionClassName={classNames("text-sm text-subtle", customClassNames?.description)}
|
||||
switchContainerClassName={customClassNames?.container}
|
||||
@@ -227,6 +228,7 @@ const FixedHosts = ({
|
||||
<div className="border-subtle flex flex-col gap-6 rounded-bl-md rounded-br-md border border-t-0 px-6">
|
||||
<AddMembersWithSwitch
|
||||
data-testid="fixed-hosts-select"
|
||||
placeholder={t("add_a_member")}
|
||||
teamId={teamId}
|
||||
teamMembers={teamMembers}
|
||||
customClassNames={customClassNames?.addMembers}
|
||||
|
||||
@@ -23,6 +23,7 @@ type Props = {
|
||||
labelClassName?: string;
|
||||
descriptionClassName?: string;
|
||||
noIndentation?: boolean;
|
||||
hideSwitch?: boolean;
|
||||
};
|
||||
|
||||
function SettingsToggle({
|
||||
@@ -41,6 +42,7 @@ function SettingsToggle({
|
||||
labelClassName,
|
||||
descriptionClassName,
|
||||
noIndentation = false,
|
||||
hideSwitch,
|
||||
...rest
|
||||
}: Props) {
|
||||
const [animateRef] = useAutoAnimate<HTMLDivElement>();
|
||||
@@ -77,16 +79,18 @@ function SettingsToggle({
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
<div className="my-auto h-full">
|
||||
<Switch
|
||||
data-testid={rest["data-testid"]}
|
||||
fitToHeight={true}
|
||||
checked={checked}
|
||||
onCheckedChange={onCheckedChange}
|
||||
disabled={disabled}
|
||||
tooltip={tooltip}
|
||||
/>
|
||||
</div>
|
||||
{!hideSwitch && (
|
||||
<div className="my-auto h-full">
|
||||
<Switch
|
||||
data-testid={rest["data-testid"]}
|
||||
fitToHeight={true}
|
||||
checked={checked}
|
||||
onCheckedChange={onCheckedChange}
|
||||
disabled={disabled}
|
||||
tooltip={tooltip}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex space-x-3">
|
||||
|
||||
Reference in New Issue
Block a user