Skip to content

Change: allow editing a target that a task refers to #5541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
TheBeast85 wants to merge 1 commit into from
Closed

Change: allow editing a target that a task refers to #5541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions src/web/pages/targets/TargetComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ const TargetComponent = ({
string | undefined
>(undefined);
const [name, setName] = useState<string | undefined>(undefined);
const [inUse, setInUse] = useState<boolean>(false);
const [excludeHosts, setExcludeHosts] = useState<string | undefined>(
undefined,
);
Expand Down Expand Up @@ -229,7 +228,6 @@ const TargetComponent = ({
setSshElevateCredentialId(entity.sshElevateCredential?.id);
setPortListId(entity.portList?.id);
setName(entity.name);
setInUse(entity.isInUse());
setExcludeHosts(entity.excludeHosts?.join(', '));
setHosts(entity.hosts.join(', '));
setReverseLookupOnly(entity.reverseLookupOnly);
Expand All @@ -251,7 +249,6 @@ const TargetComponent = ({
setSshCredentialId(undefined);
setSshElevateCredentialId(undefined);
setPortListId(DEFAULT_PORT_LIST_ID);
setInUse(false);
setExcludeHosts(undefined);
setHosts(undefined);
setReverseLookupOnly(undefined);
Expand Down Expand Up @@ -367,19 +364,10 @@ const TargetComponent = ({

const handleSaveClick = async (data: TargetDialogData) => {
const promise = isDefined(data.id)
? handleEntitySave(
data.inUse
? {
id: data.id as string,
comment: data.comment,
aliveTests: data.aliveTests,
name: data.name,
}
: {
...data,
id: data.id as string,
},
)
? handleEntitySave({
...data,
id: data.id as string,
})
: handleEntityCreate(data);
await promise;
closeTargetDialog();
Expand Down Expand Up @@ -422,7 +410,6 @@ const TargetComponent = ({
hostsCount={hostsCount}
hostsFilter={hostsFilter}
id={targetId}
inUse={inUse}
krb5CredentialId={krb5CredentialId}
name={name}
port={port}
Expand Down
88 changes: 32 additions & 56 deletions src/web/pages/targets/TargetDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ interface TargetDialogDefaultValues {
hosts: string;
hostsCount?: number;
hostsFilter?: Filter;
inUse: boolean;
name: string;
port: number;
reverseLookupOnly: boolean;
Expand All @@ -117,7 +116,6 @@ interface TargetDialogProps {
hostsCount?: number;
hostsFilter?: Filter;
id?: string;
inUse?: boolean;
name?: string;
port?: number;
portListId?: string;
Expand Down Expand Up @@ -171,7 +169,6 @@ const TargetDialog = ({
hostsCount,
hostsFilter,
id,
inUse = false,
name,
port = DEFAULT_PORT,
portListId = DEFAULT_PORT_LIST_ID,
Expand Down Expand Up @@ -388,7 +385,6 @@ const TargetDialog = ({
hosts,
hostsCount,
hostsFilter,
inUse,
name,
port,
reverseLookupOnly,
Expand Down Expand Up @@ -435,14 +431,13 @@ const TargetDialog = ({
<Row>
<Radio
checked={state.targetSource === 'manual'}
disabled={inUse}
name="targetSource"
title={_('Manual')}
value="manual"
onChange={onValueChange}
/>
<TextField
disabled={inUse || state.targetSource !== 'manual'}
disabled={state.targetSource !== 'manual'}
grow="1"
name="hosts"
value={state.hosts}
Expand All @@ -452,14 +447,13 @@ const TargetDialog = ({
<Row>
<Radio
checked={state.targetSource === 'file'}
disabled={inUse}
name="targetSource"
title={_('From file')}
value="file"
onChange={onValueChange}
/>
<FileField
disabled={inUse || state.targetSource !== 'file'}
disabled={state.targetSource !== 'file'}
grow="1"
name="file"
value={state.file}
Expand All @@ -471,7 +465,6 @@ const TargetDialog = ({
{state.hostsCount && (
<Radio
checked={state.targetSource === 'asset_hosts'}
disabled={inUse}
name="targetSource"
title={_('From host assets ({{count}} hosts)', {
count: state.hostsCount,
Expand All @@ -487,14 +480,13 @@ const TargetDialog = ({
<Row>
<Radio
checked={state.targetExcludeSource === 'manual'}
disabled={inUse}
name="targetExcludeSource"
title={_('Manual')}
value="manual"
onChange={onValueChange}
/>
<TextField
disabled={inUse || state.targetExcludeSource !== 'manual'}
disabled={state.targetExcludeSource !== 'manual'}
grow="1"
name="excludeHosts"
value={state.excludeHosts}
Expand All @@ -504,14 +496,13 @@ const TargetDialog = ({
<Row>
<Radio
checked={state.targetExcludeSource === 'file'}
disabled={inUse}
name="targetExcludeSource"
title={_('From file')}
value="file"
onChange={onValueChange}
/>
<FileField
disabled={inUse || state.targetExcludeSource !== 'file'}
disabled={state.targetExcludeSource !== 'file'}
grow="1"
name="excludeFile"
value={state.excludeFile}
Expand All @@ -527,7 +518,6 @@ const TargetDialog = ({
>
<YesNoRadio<boolean>
convert={parseBoolean}
disabled={inUse}
name="allowSimultaneousIPs"
noValue={false}
value={state.allowSimultaneousIPs}
Expand All @@ -539,7 +529,6 @@ const TargetDialog = ({
{capabilities.mayAccess('portlist') && (
<FormGroup direction="row" title={_('Port List')}>
<Select
disabled={inUse}
grow="1"
items={renderSelectItems(
portLists as RenderSelectItemProps[],
Expand All @@ -548,7 +537,7 @@ const TargetDialog = ({
value={state.portListId}
onChange={onPortListChange}
/>
{!inUse && capabilities.mayCreate('portlist') && (
{capabilities.mayCreate('portlist') && (
<NewIcon
title={_('Create a new port list')}
onClick={onNewPortListClick}
Expand Down Expand Up @@ -637,7 +626,6 @@ const TargetDialog = ({
isDefined(state.sshCredentialId) &&
state.sshCredentialId !== UNSET_VALUE
}
disabled={inUse}
grow="1"
items={renderSelectItems(
sshCredentials as RenderSelectItemProps[],
Expand All @@ -649,23 +637,20 @@ const TargetDialog = ({
/>
{_('on port')}
<NumberField
disabled={inUse}
name="port"
value={state.port}
onChange={onValueChange}
/>
{!inUse && (
<NewIcon<NewCredentialData>
data-testid="new-icon-ssh"
title={_('Create a new credential')}
value={NEW_SSH}
onClick={
onNewCredentialsClick as (
value?: NewCredentialData,
) => void
}
/>
)}
<NewIcon<NewCredentialData>
data-testid="new-icon-ssh"
title={_('Create a new credential')}
value={NEW_SSH}
onClick={
onNewCredentialsClick as (
value?: NewCredentialData,
) => void
}
/>
</Row>
{isDefined(state.sshCredentialId) &&
state.sshCredentialId !== UNSET_VALUE && (
Expand All @@ -683,7 +668,6 @@ const TargetDialog = ({
isDefined(state.sshElevateCredentialId) &&
state.sshElevateCredentialId !== UNSET_VALUE
}
disabled={inUse}
grow="1"
items={renderSelectItems(
elevateUpCredentials as RenderSelectItemProps[],
Expand All @@ -693,17 +677,15 @@ const TargetDialog = ({
value={state.sshElevateCredentialId}
onChange={onSshElevateCredentialChange}
/>
{!inUse && (
<NewIcon<NewCredentialData>
title={_('Create a new credential')}
value={NEW_SSH_ELEVATE}
onClick={
onNewCredentialsClick as (
value?: NewCredentialData,
) => void
}
/>
)}
<NewIcon<NewCredentialData>
title={_('Create a new credential')}
value={NEW_SSH_ELEVATE}
onClick={
onNewCredentialsClick as (
value?: NewCredentialData,
) => void
}
/>
</Row>
)}
</FormGroup>
Expand All @@ -719,9 +701,8 @@ const TargetDialog = ({
}
data-testid="krb5-credential-select"
disabled={
inUse ||
(isDefined(state.smbCredentialId) &&
state.smbCredentialId !== UNSET_VALUE)
isDefined(state.smbCredentialId) &&
state.smbCredentialId !== UNSET_VALUE
}
grow="1"
items={renderSelectItems(
Expand All @@ -732,7 +713,7 @@ const TargetDialog = ({
value={state.krb5CredentialId}
onChange={onKrb5CredentialChange}
/>
{!inUse && hasPermissionToCreateCredential && (
{hasPermissionToCreateCredential && (
<NewIcon<NewCredentialData>
title={_('Create a new credential')}
value={NEW_KRB5}
Expand All @@ -756,9 +737,8 @@ const TargetDialog = ({
}
data-testid="smb-credential-select"
disabled={
inUse ||
(isDefined(state.krb5CredentialId) &&
state.krb5CredentialId !== UNSET_VALUE)
isDefined(state.krb5CredentialId) &&
state.krb5CredentialId !== UNSET_VALUE
}
grow="1"
items={renderSelectItems(
Expand All @@ -769,7 +749,7 @@ const TargetDialog = ({
value={state.smbCredentialId}
onChange={onSmbCredentialChange}
/>
{!inUse && hasPermissionToCreateCredential && (
{hasPermissionToCreateCredential && (
<NewIcon<NewCredentialData>
data-testid="new-icon-smb"
title={_('Create a new credential')}
Expand All @@ -792,7 +772,6 @@ const TargetDialog = ({
isDefined(state.esxiCredentialId) &&
state.esxiCredentialId !== UNSET_VALUE
}
disabled={inUse}
grow="1"
items={renderSelectItems(
upCredentials as RenderSelectItemProps[],
Expand All @@ -802,7 +781,7 @@ const TargetDialog = ({
value={state.esxiCredentialId}
onChange={onEsxiCredentialChange}
/>
{!inUse && hasPermissionToCreateCredential && (
{hasPermissionToCreateCredential && (
<NewIcon<NewCredentialData>
data-testid="new-icon-esxi"
title={_('Create a new credential')}
Expand All @@ -825,7 +804,6 @@ const TargetDialog = ({
isDefined(state.snmpCredentialId) &&
state.snmpCredentialId !== UNSET_VALUE
}
disabled={inUse}
grow="1"
items={renderSelectItems(
snmpCredentials as RenderSelectItemProps[],
Expand All @@ -835,7 +813,7 @@ const TargetDialog = ({
value={state.snmpCredentialId}
onChange={onSnmpCredentialChange}
/>
{!inUse && hasPermissionToCreateCredential && (
{hasPermissionToCreateCredential && (
<NewIcon<NewCredentialData>
data-testid="new-icon-snmp"
title={_('Create a new credential')}
Expand All @@ -853,7 +831,6 @@ const TargetDialog = ({
<FormGroup title={_('Reverse Lookup Only')}>
<YesNoRadio<boolean>
convert={parseBoolean}
disabled={inUse}
name="reverseLookupOnly"
noValue={false}
value={state.reverseLookupOnly}
Expand All @@ -865,7 +842,6 @@ const TargetDialog = ({
<FormGroup title={_('Reverse Lookup Unify')}>
<YesNoRadio<boolean>
convert={parseBoolean}
disabled={inUse}
name="reverseLookupUnify"
noValue={false}
value={state.reverseLookupUnify}
Expand Down
2 changes: 0 additions & 2 deletions src/web/pages/targets/__tests__/TargetComponent.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ describe('TargetComponent tests', () => {
hostsCount: undefined,
hostsFilter: undefined,
id: undefined,
inUse: false,
krb5CredentialId: undefined,
name: 'Unnamed',
port: 22,
Expand Down Expand Up @@ -163,7 +162,6 @@ describe('TargetComponent tests', () => {
hostsCount: undefined,
hostsFilter: undefined,
id: '1234',
inUse: false,
krb5CredentialId: undefined,
name: 'My Target',
port: 22,
Expand Down
Loading