Validate hostPath based on the error callback from FileAutoComplete

cockpit-project · Nov 10, 2023 · 40d33d0 · 40d33d0
1 parent c3c4a3f
commit 40d33d0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/ImageRunModal.jsx b/src/ImageRunModal.jsx
@@ -624,8 +624,8 @@ export class ImageRunModal extends React.Component {
             validationFailed.publish = publishValidation;
 
         const volumesValidation = volumes.map(a => {
+            // We can't validate hostPath as that happens via an error callback.
             return {
-                hostPath: validateVolume(a.hostPath, "hostPath"),
                 containerPath: validateVolume(a.containerPath, "containerPath"),
             };
         });
@@ -659,6 +659,7 @@ export class ImageRunModal extends React.Component {
     *            Index needs to corellate with a row number
     */
     dynamicListOnValidationChange = (value, key) => {
+        console.log('dynamic list validation', value, key);
         const validationFailedDelta = { ...this.state.validationFailed };
 
         validationFailedDelta[key] = value;
@@ -1139,6 +1140,7 @@ export class ImageRunModal extends React.Component {
                 </Tabs>
             </Form>
         );
+        console.log(dialogValues);
         return (
             <Modal isOpen
                    position="top" variant="medium"

diff --git a/src/Volume.jsx b/src/Volume.jsx
@@ -17,6 +17,8 @@ const _ = cockpit.gettext;
 export function validateVolume(value, key) {
     switch (key) {
     case "hostPath":
+        if (value)
+            return value;
         break;
     case "containerPath":
         if (!value)
@@ -38,9 +40,11 @@ export const Volume = ({ id, item, onChange, idx, removeitem, additem, options,
             >
                 <FileAutoComplete id={id + "-host-path"}
                     value={item.hostPath || ''}
-                    onChange={value => {
+                    onChange={(value, error) => {
+                        console.log(`value: ${value}, error: ${error}`);
+                        console.log(validationFailed);
                         utils.validationClear(validationFailed, "hostPath", onValidationChange);
-                        utils.validationDebounce(() => onValidationChange({ ...validationFailed, hostPath: validateVolume(value, "hostPath") }));
+                        utils.validationDebounce(() => onValidationChange({ ...validationFailed, hostPath: validateVolume(error, "hostPath") }));
                         onChange(idx, 'hostPath', value);
                     }} />
                 <FormHelper helperTextInvalid={validationFailed?.hostPath} />