Skip to content

Rearrange firewall rules form and add help text #2190

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
david-crespo merged 5 commits into from
Apr 24, 2024
Merged

Rearrange firewall rules form and add help text #2190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0887d0e
rearrange firewall rules form and add help text
david-crespo Apr 24, 2024
586e371
move priority to the bottom of the top section, add help text
david-crespo Apr 24, 2024
3c6cc86
rearrange filters and fix typographic hierarchy
david-crespo Apr 24, 2024
75c40d1
validate port range, both syntax and dupe
david-crespo Apr 24, 2024
544546b
improve targets help text, thanks @taspelund
david-crespo Apr 24, 2024
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: 6 additions & 0 deletions app/api/util.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ describe('parsePortRange', () => {
expect(parsePortRange('1-45690')).toEqual([1, 45690])
expect(parsePortRange('5-5')).toEqual([5, 5])
})

it('with surrounding whitespace', () => {
expect(parsePortRange('123-456 ')).toEqual([123, 456])
expect(parsePortRange(' 1-45690')).toEqual([1, 45690])
expect(parsePortRange(' 5-5 \n')).toEqual([5, 5])
})
})

describe('rejects', () => {
Expand Down
2 changes: 1 addition & 1 deletion app/api/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type PortRange = [number, number]
// null so we can annotate the failure with a reason
export function parsePortRange(portRange: string): PortRange | null {
// TODO: pull pattern from openapi spec (requires generator work)
const match = /^([0-9]{1,5})((?:-)[0-9]{1,5})?$/.exec(portRange)
const match = /^([0-9]{1,5})((?:-)[0-9]{1,5})?$/.exec(portRange.trim())
if (!match) return null

const p1 = parseInt(match[1], 10)
Expand Down
Loading