fix launch prompt errors when no survey present

This commit is contained in:
Keith Grant
2020-05-12 14:38:05 -07:00
parent 23a20b9db0
commit e532f4c0c5
3 changed files with 15 additions and 6 deletions

View File

@@ -8,10 +8,16 @@ import getSurveyValues from '../getSurveyValues';
function PreviewStep({ resource, config, survey, formErrors }) { function PreviewStep({ resource, config, survey, formErrors }) {
const { values } = useFormikContext(); const { values } = useFormikContext();
const surveyValues = getSurveyValues(values); const surveyValues = getSurveyValues(values);
const passwordFields = survey.spec let extraVars;
.filter(q => q.type === 'password') if (survey && survey.spec) {
.map(q => q.variable); const passwordFields = survey.spec
const masked = maskPasswords(surveyValues, passwordFields); .filter(q => q.type === 'password')
.map(q => q.variable);
const masked = maskPasswords(surveyValues, passwordFields);
extraVars = yaml.safeDump(mergeExtraVars(values.extra_vars, masked));
} else {
extraVars = values.extra_vars;
}
return ( return (
<> <>
<PromptDetail <PromptDetail
@@ -19,7 +25,7 @@ function PreviewStep({ resource, config, survey, formErrors }) {
launchConfig={config} launchConfig={config}
overrides={{ overrides={{
...values, ...values,
extra_vars: yaml.safeDump(mergeExtraVars(values.extra_vars, masked)), extra_vars: extraVars,
}} }}
/> />
{formErrors && ( {formErrors && (

View File

@@ -9,6 +9,9 @@ export default function useInventoryStep(config, resource, visitedSteps, i18n) {
const [stepErrors, setStepErrors] = useState({}); const [stepErrors, setStepErrors] = useState({});
const validate = values => { const validate = values => {
if (!config.ask_inventory_on_launch) {
return {};
}
const errors = {}; const errors = {};
if (!values.inventory) { if (!values.inventory) {
errors.inventory = i18n._(t`An inventory must be selected`); errors.inventory = i18n._(t`An inventory must be selected`);

View File

@@ -56,7 +56,7 @@ export default function useSurveyStep(config, resource, visitedSteps, i18n) {
isReady: !isLoading && !!survey, isReady: !isLoading && !!survey,
error, error,
setTouched: setFieldsTouched => { setTouched: setFieldsTouched => {
if (!survey) { if (!survey || !survey.spec) {
return; return;
} }
const fields = {}; const fields = {};