Skip to content

fix: UI: Nothing happens selecting cluster URL/Name dropdown (#13655) #21028

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

Merged
ishitasequeira merged 1 commit into from
Dec 4, 2024
+47 −20
Merged

fix: UI: Nothing happens selecting cluster URL/Name dropdown (#13655) #21028

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
67 changes: 47 additions & 20 deletions ui/src/app/applications/components/application-create-panel/application-create-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ const DEFAULT_APP: Partial<models.Application> = {
},
spec: {
destination: {
name: '',
name: undefined,
namespace: '',
server: ''
server: undefined
},
source: {
path: '',
Expand Down Expand Up @@ -108,18 +108,15 @@ export const ApplicationCreatePanel = (props: {
}) => {
const [yamlMode, setYamlMode] = React.useState(false);
const [explicitPathType, setExplicitPathType] = React.useState<{path: string; type: models.AppSourceType}>(null);
const [destFormat, setDestFormat] = React.useState('URL');
const [retry, setRetry] = React.useState(false);
const app = deepMerge(DEFAULT_APP, props.app || {});
const debouncedOnAppChanged = debounce(props.onAppChanged, 800);
const [destinationFieldChanges, setDestinationFieldChanges] = React.useState({destFormat: 'URL', destFormatChanged: null});
const comboSwitchedFromPanel = React.useRef(false);
let destinationComboValue = destinationFieldChanges.destFormat;

React.useEffect(() => {
if (app?.spec?.destination?.name && app.spec.destination.name !== '') {
setDestFormat('NAME');
} else {
setDestFormat('URL');
}

comboSwitchedFromPanel.current = false;
return () => {
debouncedOnAppChanged.cancel();
};
Expand All @@ -135,6 +132,41 @@ export const ApplicationCreatePanel = (props: {
formApi.setAllValues(appToNormalize);
}

const currentName = app.spec.destination.name;
const currentServer = app.spec.destination.server;
if (destinationFieldChanges.destFormatChanged !== null) {
if (destinationComboValue == 'NAME') {
if (currentName === undefined && currentServer !== undefined && comboSwitchedFromPanel.current === false) {
destinationComboValue = 'URL';
} else {
delete app.spec.destination.server;
if (currentName === undefined) {
app.spec.destination.name = '';
}
}
} else {
if (currentServer === undefined && currentName !== undefined && comboSwitchedFromPanel.current === false) {
destinationComboValue = 'NAME';
} else {
delete app.spec.destination.name;
if (currentServer === undefined) {
app.spec.destination.server = '';
}
}
}
} else {
if (currentName === undefined && currentServer === undefined) {
destinationComboValue = destinationFieldChanges.destFormat;
app.spec.destination.server = '';
} else {
if (currentName != undefined) {
destinationComboValue = 'NAME';
} else {
destinationComboValue = 'URL';
}
}
}

return (
<React.Fragment>
<DataLoader
Expand Down Expand Up @@ -377,7 +409,7 @@ export const ApplicationCreatePanel = (props: {
<div className='white-box'>
<p>DESTINATION</p>
<div className='row argo-form-row'>
{(destFormat.toUpperCase() === 'URL' && (
{(destinationComboValue.toUpperCase() === 'URL' && (
<div className='columns small-10'>
<FormField
formApi={api}
Expand Down Expand Up @@ -405,22 +437,17 @@ export const ApplicationCreatePanel = (props: {
<DropDownMenu
anchor={() => (
<p>
{destFormat} <i className='fa fa-caret-down' />
{destinationComboValue} <i className='fa fa-caret-down' />
</p>
)}
qeId='application-create-dropdown-destination'
items={['URL', 'NAME'].map((type: 'URL' | 'NAME') => ({
title: type,
action: () => {
if (destFormat !== type) {
const updatedApp = api.getFormState().values as models.Application;
if (type === 'URL') {
delete updatedApp.spec.destination.name;
} else {
delete updatedApp.spec.destination.server;
}
api.setAllValues(updatedApp);
setDestFormat(type);
if (destinationComboValue !== type) {
destinationComboValue = type;
comboSwitchedFromPanel.current = true;
setDestinationFieldChanges({destFormat: type, destFormatChanged: 'changed'});
}
}
}))}
Expand Down