From 2a00c47943658a8a8165ca5f2bfba87d399b1e10 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon <blizzz@arthur-schiwon.de> Date: Tue, 1 Sep 2020 10:29:46 +0200 Subject: [PATCH] do not hide "matches" and "does not match" checkers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 <blizzz@arthur-schiwon.de> --- apps/workflowengine/js/workflowengine.js | Bin 1283608 -> 1283580 bytes apps/workflowengine/js/workflowengine.js.map | Bin 3485096 -> 3484967 bytes .../src/components/Checks/file.js | 12 ++++-------- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/workflowengine/js/workflowengine.js b/apps/workflowengine/js/workflowengine.js index cb55019f1dc94e6b2b6305dcfbcbd6d1321d65d7..ecce91b30ed5b40dad3a75fa6239e512afc1d35f 100644 GIT binary patch delta 70 zcmbQS#_!K+zlIjZ7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQ7NIS|qA}CY a#Ikcvf7>ry&ZslJr(ZZ>yHKn!n<W5aeiv#0 delta 94 zcmeyf+Hb}hzlIjZ7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQ7NIS|qA}BL ylzF)%Q}xOcb4pY7ic1oUN{YiXOENT+^p!O2qo-f&7p|C|*Dsv3{acJMn<W6({~x#j diff --git a/apps/workflowengine/js/workflowengine.js.map b/apps/workflowengine/js/workflowengine.js.map index 2e8462f2e10d3aa89e1ca185e6a7e9353e0fe652..29341656c9c8a7b76e696e9d9b5b1bd8054b2989 100644 GIT binary patch delta 817 zcmZwEOH30{6b9f-1*yF5#XbceMTLr7Y_S8_1txc<lXj4T6%2xGS{_n`LQ5wt8WYe3 zOEodMaYGaqDkjE-$?RQ`xFs=>jc!b2VRXkU;@^@O7cRa#nKNh3oO9;Y#=7+K^SU(u zUJ5NN#ug;7z#%AsQaB7{V1*-44i!)dRZwll7D!p%F~HTJ!lIn_GL@@6IJg!RPqs;q z=-wlCv9(R24r8{9h53x87jh<*!l~xP&<=Sdak05W=B1ptvrBaArA(OVJUk@&cSw_{ zbW)F5x<{5RbwM?y%osY;;>~JL?grC1k9Oo07E1)ghu`F?cRG|v&lT$Pct?BW@AKZo z?a(!p<bCNl)8lCo+$YNww`Rla3TrkL^{)ACpG--XtWVT$kp|JdMmojwDjGFQEOgCU zVfZvQ!1;hL9}!<a5|{a-oQ_**&WIGkQ);1fR>_M|8y&UHA$gGVK^EgY#`-wF9uylk z+V3<15zHS@i#y63%<sz!%}#&1(&$C!+E8&R6LXP+UHZlST~aH?9n=tQ4(b%Y9CWkV z_&0Y_e0S1k*xW-G^|nlOL|8BWLK;`}q^oR<^Q6+2?J9=-Ii+|-8(dF{PcB+71;n<C zHrB|7%909CBsH`gp9r-Hzngl)?Fb`zWU^H+j8dFOox%-*p+c>s()zz|j;U+}uZ1y( z=F?J(OKu7^a1?A{2M0L81#UP7wNMAg;RKw7Q{aJmI1OjuEHpqPc;Os0!Fgx~1}$&_ zeBg&xxCjAr$t{0*EaqR!Pwh>f&dZ*A!>QqHW-M!DQl6W`De?B5>=x6jvR}MdmAlQ- IH}cAZKRfOWfB*mh delta 906 zcmYMz%TE(g6bIl8s6bKXV(9}=EQ*xcOG|A_Wn*$@I%%h*l!^w?E}SY!E2Ur`4AmIH zg=|=`F?Wp#@v(tKl5UK~_%9F_;=+x4mf9xbZ)%XmcPDcnXU;h{^ZMJK@MeEcSlJcA ztEOT}E0l`U*-~bWtqRZt&2R!v!YOEhR%ingw8LpQ107YiDw>wZrWlibqfr`RvR9%B z##BZX#^Rx6iN^8Ni!nOQ*fbqya$ce`lP54R#mn#g7AMRL5{rc7<7s^%#t$qcZqb;o zWMt!Xge@wnu_Gt(7j@CaBQ-H6#Q1JaToD31SQpg}cOgPm7P(_=lYQ0oy7;rHHy6%J zi)EE6+I)CIzx_Y0WZKKu|A>=LJ)AC9jL=LQLkUM|C(?!R4TNJ;k2I=k72bR(zG}}F zBXpd)%aR<b?i`Bqg0NKW6UcI#N%ty^5;GN^+!yWq(=TzL`rSmNR#GWPjiq_n2v?FG zbB~!kFpuEC3}Z7i$yk!2gSWhV%S>)sb-&R_znn1YC^WhyBdXX%4)~UZSh>YQHu#p6 zSOqs9u8BQ-yDmETWEa`C>&Q=K%D)!mD^a8S2|5?%o|@Rrzgo$XP~mYKaSlHWMU9I} z6!An_s!V4Y%SxeAtT8>JH|{ZkOqe>yH*KU}2=XsBGT1p<mT6XE>8ygRwM;m~YY0fM zVH%t7=Y6VCO`{}v0WX*g8!@wz|LB`MZYMp$;#$T|pcBr58M?p%R<MB`x}gVp;T)WY zKDYo5=!c7N2?pRY41yDezy(*p4HSmK16~*bA6x~0HDeF_*buxt@;302Pt63n2bZ*5 zdDe6MqYOE{PM6E^B$ZE<Ql-Ldsa(iA?()yppoL%G3AFG&Tkx6LSbb^?M;lUkzWF}j P=O3)W_UgxXf$a0Yp$HyS diff --git a/apps/workflowengine/src/components/Checks/file.js b/apps/workflowengine/src/components/Checks/file.js index ee6a476a3a1..26c246be591 100644 --- a/apps/workflowengine/src/components/Checks/file.js +++ b/apps/workflowengine/src/components/Checks/file.js @@ -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') }, ] -- GitLab