Skip to content

fix(ui): display valuesobject if set #14257

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
crenshaw-dev merged 7 commits into from
Jul 27, 2023
Merged

fix(ui): display valuesobject if set #14257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6377259
fix: display valuesobject if set
blakepettersson Jun 28, 2023
3a3b202
fix: set valuesobject on save
blakepettersson Jul 6, 2023
758de44
fix: set `helm.values` to empty string on save
blakepettersson Jul 6, 2023
9f0cc61
chore: eslint
blakepettersson Jul 6, 2023
2ce71eb
chore: eslint
blakepettersson Jul 6, 2023
dbddd09
fix: deep clone app
blakepettersson Jul 11, 2023
6412846
chore: eslint
blakepettersson Jul 11, 2023
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
40 changes: 21 additions & 19 deletions ui/src/app/applications/components/application-parameters/application-parameters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ import {concatMaps} from '../../../shared/utils';
import {getAppDefaultSource} from '../utils';
import * as jsYaml from 'js-yaml';

let isValuesRaw = false;

const TextWithMetadataField = ReactFormField((props: {metadata: {value: string}; fieldApi: FieldApi; className: string}) => {
const {
fieldApi: {getValue, setValue}
Expand Down Expand Up @@ -128,17 +126,13 @@ export const ApplicationParameters = (props: {
save?: (application: models.Application, query: {validate?: boolean}) => Promise<any>;
noReadonlyMode?: boolean;
}) => {
const app = props.application;
const app = cloneDeep(props.application);
const source = getAppDefaultSource(app);
const [removedOverrides, setRemovedOverrides] = React.useState(new Array<boolean>());

let attributes: EditablePanelItem[] = [];
let appValues: string;
if (source && source.helm && source.helm.values) {
isValuesRaw = typeof source.helm.values !== 'string'; // nolint
appValues = isValuesRaw ? jsYaml.safeDump(source.helm.values) : source.helm.values;
source.helm.values = appValues;
}
const isValuesObject = source?.helm?.valuesObject;
const helmValues = isValuesObject ? jsYaml.safeDump(source.helm.valuesObject) : source?.helm?.values;
const [appParamsDeletedState, setAppParamsDeletedState] = React.useState([]);

if (props.details.type === 'Kustomize' && props.details.kustomize) {
Expand Down Expand Up @@ -225,16 +219,23 @@ export const ApplicationParameters = (props: {
title: 'VALUES',
view: source.helm && (
<Expandable>
<pre>{appValues}</pre>
<pre>{helmValues}</pre>
</Expandable>
),
edit: (formApi: FormApi) => (
<div>
<pre>
<FormField formApi={formApi} field='spec.source.helm.values' component={TextArea} />
</pre>
</div>
)
edit: (formApi: FormApi) => {
// In case source.helm.valuesObject is set, set source.helm.values to its value
if (source.helm) {
source.helm.values = helmValues;
}

return (
<div>
<pre>
<FormField formApi={formApi} field='spec.source.helm.values' component={TextArea} />
</pre>
</div>
);
}
});
const paramsByName = new Map<string, models.HelmParameter>();
(props.details.helm.parameters || []).forEach(param => paramsByName.set(param.name, param));
Expand Down Expand Up @@ -527,8 +528,9 @@ export const ApplicationParameters = (props: {
params = params.filter(param => !appParamsDeletedState.includes(param.name));
input.spec.source.plugin.parameters = params;
}
if (input.spec.source.helm && input.spec.source.helm.values && isValuesRaw) {
input.spec.source.helm.values = jsYaml.safeLoad(input.spec.source.helm.values); // Load values as json
if (input.spec.source.helm && input.spec.source.helm.valuesObject) {
input.spec.source.helm.valuesObject = jsYaml.safeLoad(input.spec.source.helm.values); // Deserialize json
input.spec.source.helm.values = '';
}
await props.save(input, {});
setRemovedOverrides(new Array<boolean>());
Expand Down
1 change: 1 addition & 0 deletions ui/src/app/shared/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ export interface ApplicationSource {
export interface ApplicationSourceHelm {
valueFiles: string[];
values?: string;
valuesObject?: any;
parameters: HelmParameter[];
fileParameters: HelmFileParameter[];
}
Expand Down