diff --git a/frontend/src/utils/index.ts b/frontend/src/utils/index.ts index d85c7f3ff3b966fe094f9bb1c21e8a35856c1bd5..90854e450499987ff83b45959015cbf070b5ad7c 100644 --- a/frontend/src/utils/index.ts +++ b/frontend/src/utils/index.ts @@ -125,6 +125,7 @@ function stringContainsIllegalChars(string: string): boolean { // Only allow the following characters: // ----- Basic Latin ----- // U+0020 (Space) + // U+002D (Hyphen-minus) // U+0041 - U+005A (Latin Alphabet: Uppercase) // U+0061 - U+007A (Latin Alphabet: Lowercase) // ----- Latin-1 Supplement ----- @@ -136,7 +137,7 @@ function stringContainsIllegalChars(string: string): boolean { // U+0100 - U+017F (European Latin) // eslint-disable-next-line no-control-regex - return /[^\u0020\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u017F]/g.test( + return /[^\u0020\u002D\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u017F]/g.test( string ) } diff --git a/frontend/update-harbor-image.sh b/frontend/update-harbor-image.sh index c45ebc1ca1ef937720750bc42dc45a628300f0fd..69f5a66df8863b8adcca38a5a98bbbd76a4a7e0f 100755 --- a/frontend/update-harbor-image.sh +++ b/frontend/update-harbor-image.sh @@ -25,7 +25,7 @@ fi echo "Will build using $BUILDER" echo "Building $IMAGE_TAG" -$BUILDER build --format docker --no-cache -t $IMAGE_TAG . +$BUILDER build --format docker --pull=always -t $IMAGE_TAG . echo "Pushing $IMAGE_TAG" $BUILDER push $IMAGE_TAG diff --git a/greg/tests/test_utils.py b/greg/tests/test_utils.py index 75b5687e76f180d6eb1afae793f318de6b2e4a89..336285ebfc8a91fae60600d7b4da25793ef46d64 100644 --- a/greg/tests/test_utils.py +++ b/greg/tests/test_utils.py @@ -33,6 +33,7 @@ def test_not_valid_so_number(): "string, expected_output", [ ("AZ az ÀÖ ØÞßö øÿ Āſ", False), + ("Kari-Mette", False), ("aaƂåå", True), ("!", True), ("÷", True), diff --git a/greg/utils.py b/greg/utils.py index b60d9b948709f913495c86f63fc321e921b0f38f..63e17472a7a7b5fa6cb4af6f9dbc4d4e1ff96ef8 100644 --- a/greg/utils.py +++ b/greg/utils.py @@ -226,6 +226,7 @@ def string_contains_illegal_chars(string: str) -> bool: # Only allow the following characters: # ----- Basic Latin ----- # U+0020 (Space) + # U+002D (Hyphen-minus) # U+0041 - U+005A (Latin Alphabet: Uppercase) # U+0061 - U+007A (Latin Alphabet: Lowercase) # ----- Latin-1 Supplement ----- @@ -237,7 +238,7 @@ def string_contains_illegal_chars(string: str) -> bool: # U+0100 - U+017F (European Latin) return bool( re.search( - r"[^\u0020\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u017F]", + r"[^\u0020\u002D\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u017F]", string, ) ) diff --git a/update-harbor-image.sh b/update-harbor-image.sh index 16dc8edd4bd490a527ebddbdca5c28ea9a150a7f..1108d7ecfde62177bcd8c8972163a6c8d0881e5e 100755 --- a/update-harbor-image.sh +++ b/update-harbor-image.sh @@ -28,7 +28,7 @@ fi echo "Will build using $BUILDER" echo "Building $IMAGE_TAG" -$BUILDER build --format docker --no-cache -t $IMAGE_TAG . +$BUILDER build --format docker --pull=always -t $IMAGE_TAG . echo "Pushing $IMAGE_TAG" $BUILDER push $IMAGE_TAG