Skip to content

[stable18] Flow: do not hide "matches" and "does not match" checkers #22989

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
rullzer merged 1 commit into from
Oct 1, 2020
Merged

[stable18] Flow: do not hide "matches" and "does not match" checkers #22989

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
do not hide "matches" and "does not match" checkers 
- they show up previously with / typed – end user needs to know about it
- inconsistent with some other fields, that show it directly

Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz @nickvergessen
blizzz authored and nickvergessen committed Sep 29, 2020
commit 6137466cb05c981fa645eaffebd49d80d14ad257
2 changes: 1 addition & 1 deletion apps/workflowengine/js/workflowengine.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/workflowengine/js/workflowengine.js.map
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 4 additions & 8 deletions apps/workflowengine/src/components/Checks/file.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,14 @@
*
*/

import { stringValidator, validateIPv4, validateIPv6 } from './../../helpers/validators'
import { stringValidator, validateIPv4, validateIPv6 } from '../../helpers/validators'
import FileMimeType from './FileMimeType'
import FileSystemTag from './FileSystemTag'

const stringOrRegexOperators = (check) => {
if (check.value.startsWith('/')) {
return [
{ operator: 'matches', name: t('workflowengine', 'matches') },
{ operator: '!matches', name: t('workflowengine', 'does not match') },
]
}
const stringOrRegexOperators = () => {
return [
{ operator: 'matches', name: t('workflowengine', 'matches') },
{ operator: '!matches', name: t('workflowengine', 'does not match') },
{ operator: 'is', name: t('workflowengine', 'is') },
{ operator: '!is', name: t('workflowengine', 'is not') },
]
Expand Down