Skip to content
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

Jump to bottom

Handle undefined state entries #1623

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Handle undefined state entries #1623

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
6 changes: 3 additions & 3 deletions src/ImageRunModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ export class ImageRunModal extends React.Component {
containerPort: validatePublishPort(a.containerPort, "containerPort"),
};
});
if (publishValidation.some(entry => Object.keys(entry).length > 0))
if (publishValidation.some(entry => entry && Object.keys(entry).length > 0))
validationFailed.publish = publishValidation;

const volumesValidation = volumes.map(a => {
Expand All @@ -638,7 +638,7 @@ export class ImageRunModal extends React.Component {
containerPath: validateVolume(a.containerPath, "containerPath"),
};
});
if (volumesValidation.some(entry => Object.keys(entry).length > 0))
if (volumesValidation.some(entry => entry && Object.keys(entry).length > 0))
validationFailed.volumes = volumesValidation;

const envValidation = env.map(a => {
Expand All @@ -650,7 +650,7 @@ export class ImageRunModal extends React.Component {
envValue: validateEnvVar(a.envValue, "envValue"),
};
});
if (envValidation.some(entry => Object.keys(entry).length > 0))
if (envValidation.some(entry => entry && Object.keys(entry).length > 0))
validationFailed.env = envValidation;

const containerNameValidation = await this.validateContainerName(containerName);
Expand Down
27 changes: 27 additions & 0 deletions test/check-application
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2385,6 +2385,33 @@ class TestApplication(testlib.MachineCase):
b.set_input_text('#run-image-dialog-publish-0-host-port', '5001')
b.click('.pf-v5-c-modal-box__footer #create-image-create-run-btn')
self.waitContainerRow(container_name)
container_sha = self.execute(False, f"podman inspect --format '{{{{.Id}}}}' {container_name}").strip()
self.waitContainer(container_sha, False, name=container_name, image=IMG_BUSYBOX, state='Running')

# Test validation JavaScript errors when removing invalid environment entries
container_name = 'env-var-validation'
b.click(f'#containers-images tbody tr:contains("{IMG_BUSYBOX}") .ct-container-create')
b.wait_visible('div.pf-v5-c-modal-box header:contains("Create container")')

b.set_input_text("#run-image-dialog-name", container_name)
b.click("#pf-tab-1-create-image-dialog-tab-integration")

# Make sure our form validation does not crash when adding and removing invalid entries
b.click('.env-form .btn-add')
b.click('.env-form .btn-add')
b.click('.env-form .btn-add')
b.set_input_text("#run-image-dialog-env-1-key-group input", "something")
b.click('.pf-v5-c-modal-box__footer #create-image-create-run-btn')

b.wait_in_text("#run-image-dialog-env-0-key-group .pf-v5-c-helper-text__item-text", "must not be empty")
b.wait_in_text("#run-image-dialog-env-2-key-group .pf-v5-c-helper-text__item-text", "must not be empty")

# remove invalid entries
b.click('#run-image-dialog-env-0-btn-close')
b.click('#run-image-dialog-env-2-btn-close')

b.click('.pf-v5-c-modal-box__footer #create-image-create-run-btn')
self.waitContainerRow(container_name)

def _testHealthcheck(self, auth):
b = self.browser
Expand Down