From f04c7c49f80b3c7f0906920e1fea3a70688baea8 Mon Sep 17 00:00:00 2001
From: Piotr Jurczynski <619650+pjurczynski@users.noreply.github.com>
Date: Wed, 7 Aug 2024 08:36:20 +0200
Subject: [PATCH] feat: add OS X ARM download url

---
 web/elm/src/Assets.elm               |  3 ++
 web/elm/src/Concourse/Cli.elm        | 22 ++++++++-
 web/elm/tests/AssetsTests.elm        |  5 ++
 web/elm/tests/CliTests.elm           |  2 +
 web/elm/tests/DashboardTests.elm     | 11 ++++-
 web/elm/tests/PipelineTests.elm      | 14 +++++-
 web/elm/tests/WelcomeCardTests.elm   | 11 ++++-
 web/public/images/apple-arm-logo.svg | 74 ++++++++++++++++++++++++++++
 8 files changed, 135 insertions(+), 7 deletions(-)
 create mode 100644 web/public/images/apple-arm-logo.svg

diff --git a/web/elm/src/Assets.elm b/web/elm/src/Assets.elm
index 0859366a93e..20d7b0fd8ce 100644
--- a/web/elm/src/Assets.elm
+++ b/web/elm/src/Assets.elm
@@ -114,6 +114,9 @@ toPath asset =
                         OSX ->
                             "apple"
 
+                        OSXArm ->
+                            "apple-arm"
+
                         Windows ->
                             "windows"
 
diff --git a/web/elm/src/Concourse/Cli.elm b/web/elm/src/Concourse/Cli.elm
index 0e1ba5f21ab..0fefdabb335 100644
--- a/web/elm/src/Concourse/Cli.elm
+++ b/web/elm/src/Concourse/Cli.elm
@@ -6,11 +6,12 @@ import Url.Builder
 
 clis : List Cli
 clis =
-    [ OSX, Windows, Linux ]
+    [ OSX, OSXArm, Windows, Linux ]
 
 
 type Cli
     = OSX
+    | OSXArm
     | Windows
     | Linux
 
@@ -23,15 +24,26 @@ downloadUrl cli =
                 OSX ->
                     "darwin"
 
+                OSXArm ->
+                    "darwin"
+
                 Windows ->
                     "windows"
 
                 Linux ->
                     "linux"
+
+        archName =
+            case cli of
+                OSXArm ->
+                    "arm"
+
+                _ ->
+                    "amd64"
     in
     Endpoints.Cli
         |> Endpoints.toString
-            [ Url.Builder.string "arch" "amd64"
+            [ Url.Builder.string "arch" archName
             , Url.Builder.string "platform" platformName
             ]
 
@@ -44,6 +56,9 @@ label cli =
                 OSX ->
                     "OS X"
 
+                OSXArm ->
+                    "OS X arm"
+
                 Windows ->
                     "Windows"
 
@@ -59,6 +74,9 @@ id cli =
         OSX ->
             "osx"
 
+        OSXArm ->
+            "osx-arm"
+
         Windows ->
             "windows"
 
diff --git a/web/elm/tests/AssetsTests.elm b/web/elm/tests/AssetsTests.elm
index 12f3d4172ca..6e70b42ed72 100644
--- a/web/elm/tests/AssetsTests.elm
+++ b/web/elm/tests/AssetsTests.elm
@@ -24,6 +24,11 @@ toStringTests =
                     CliIcon OSX
                         |> toString
                         |> Expect.equal "/public/images/apple-logo.svg"
+            , test "OSXArm" <|
+                \_ ->
+                    CliIcon OSXArm
+                        |> toString
+                        |> Expect.equal "/public/images/apple-arm-logo.svg"
             , test "Windows" <|
                 \_ ->
                     CliIcon Windows
diff --git a/web/elm/tests/CliTests.elm b/web/elm/tests/CliTests.elm
index a2705ae21e0..adaedb66615 100644
--- a/web/elm/tests/CliTests.elm
+++ b/web/elm/tests/CliTests.elm
@@ -13,6 +13,7 @@ all =
                 List.map downloadUrl clis
                     |> Expect.equal
                         [ "/api/v1/cli?arch=amd64&platform=darwin"
+                        , "/api/v1/cli?arch=arm&platform=darwin"
                         , "/api/v1/cli?arch=amd64&platform=windows"
                         , "/api/v1/cli?arch=amd64&platform=linux"
                         ]
@@ -21,6 +22,7 @@ all =
                 List.map label clis
                     |> Expect.equal
                         [ "Download OS X CLI"
+                        , "Download OS X arm CLI"
                         , "Download Windows CLI"
                         , "Download Linux CLI"
                         ]
diff --git a/web/elm/tests/DashboardTests.elm b/web/elm/tests/DashboardTests.elm
index 9e2b3a9fe53..c31b378d415 100644
--- a/web/elm/tests/DashboardTests.elm
+++ b/web/elm/tests/DashboardTests.elm
@@ -1690,7 +1690,7 @@ all =
                         \_ ->
                             cliIcons
                                 |> Expect.all
-                                    [ Query.count (Expect.equal 3)
+                                    [ Query.count (Expect.equal 4)
                                     , Query.index 0
                                         >> Query.has
                                             [ attribute <|
@@ -1703,9 +1703,16 @@ all =
                                             [ attribute <|
                                                 Attr.attribute
                                                     "aria-label"
-                                                    "Download Windows CLI"
+                                                    "Download OS X arm CLI"
                                             ]
                                     , Query.index 2
+                                        >> Query.has
+                                            [ attribute <|
+                                                Attr.attribute
+                                                    "aria-label"
+                                                    "Download Windows CLI"
+                                            ]
+                                    , Query.index 3
                                         >> Query.has
                                             [ attribute <|
                                                 Attr.attribute
diff --git a/web/elm/tests/PipelineTests.elm b/web/elm/tests/PipelineTests.elm
index 0f68be46519..8dd74b44f73 100644
--- a/web/elm/tests/PipelineTests.elm
+++ b/web/elm/tests/PipelineTests.elm
@@ -354,7 +354,7 @@ all =
                                 >> Query.has
                                     [ style "background-image" <|
                                         Assets.backgroundImage <|
-                                            Just (Assets.CliIcon Windows)
+                                            Just (Assets.CliIcon OSXArm)
                                     , style "background-position" "50% 50%"
                                     , style "background-repeat" "no-repeat"
                                     , style "width" "12px"
@@ -363,6 +363,18 @@ all =
                                     , attribute <| Attr.download ""
                                     ]
                             , Query.index 2
+                                >> Query.has
+                                    [ style "background-image" <|
+                                        Assets.backgroundImage <|
+                                            Just (Assets.CliIcon Windows)
+                                    , style "background-position" "50% 50%"
+                                    , style "background-repeat" "no-repeat"
+                                    , style "width" "12px"
+                                    , style "height" "12px"
+                                    , style "display" "inline-block"
+                                    , attribute <| Attr.download ""
+                                    ]
+                            , Query.index 3
                                 >> Query.has
                                     [ style "background-image" <|
                                         Assets.backgroundImage <|
diff --git a/web/elm/tests/WelcomeCardTests.elm b/web/elm/tests/WelcomeCardTests.elm
index 898c0cdd356..7c3049bbdfa 100644
--- a/web/elm/tests/WelcomeCardTests.elm
+++ b/web/elm/tests/WelcomeCardTests.elm
@@ -224,7 +224,7 @@ hasWelcomeCard setup =
                 , test "icons have descriptive ARIA labels" <|
                     cliIcons
                         >> Expect.all
-                            [ Query.count (Expect.equal 3)
+                            [ Query.count (Expect.equal 4)
                             , Query.index 0
                                 >> Query.has
                                     [ attribute <|
@@ -237,9 +237,16 @@ hasWelcomeCard setup =
                                     [ attribute <|
                                         Attr.attribute
                                             "aria-label"
-                                            "Download Windows CLI"
+                                            "Download OS X arm CLI"
                                     ]
                             , Query.index 2
+                                >> Query.has
+                                    [ attribute <|
+                                        Attr.attribute
+                                            "aria-label"
+                                            "Download Windows CLI"
+                                    ]
+                            , Query.index 3
                                 >> Query.has
                                     [ attribute <|
                                         Attr.attribute
diff --git a/web/public/images/apple-arm-logo.svg b/web/public/images/apple-arm-logo.svg
new file mode 100644
index 00000000000..cf4af2a40e1
--- /dev/null
+++ b/web/public/images/apple-arm-logo.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="21px"
+   height="24px"
+   viewBox="0 0 21 24"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="apple-arm-logo.svg"
+   xml:space="preserve"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
+     id="namedview1"
+     pagecolor="#808080"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="1"
+     inkscape:cx="-125.5"
+     inkscape:cy="-1.5"
+     inkscape:window-width="1920"
+     inkscape:window-height="1145"
+     inkscape:window-x="-8"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" /><!-- Generator: Sketch Beta 51.2 (57516) - http://www.bohemiancoding.com/sketch --><title
+     id="title1">custom_apple_arm_logo</title><desc
+     id="desc1">Created with Sketch Beta.</desc><defs
+     id="defs1"><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2"><g
+         inkscape:label="Clip"
+         id="use2" /></clipPath><mask
+       maskUnits="userSpaceOnUse"
+       id="mask4"><path
+         d="m 20.376842,18.737779 c -0.361563,0.823778 -0.789684,1.582061 -1.285395,2.279216 -0.675902,0.950255 -1.229315,1.608258 -1.65596,1.973719 -0.660997,0.599494 -1.369366,0.906592 -2.128059,0.924202 -0.544411,0 -1.201276,-0.152966 -1.965577,-0.462829 -0.766957,-0.308698 -1.471932,-0.461373 -2.116401,-0.461373 -0.675902,0 -1.400652,0.152675 -2.176169,0.461373 C 8.272731,23.76195 7.647153,23.923504 7.168856,23.939659 6.44145,23.970223 5.716404,23.654393 4.9926871,22.990714 4.5307711,22.593379 3.9530081,21.912234 3.2608719,20.947134 2.5182648,19.916684 1.9077391,18.721915 1.4294424,17.359626 0.91720287,15.888178 0.66041897,14.463305 0.66041897,13.083841 0.66041897,11.503672 1.0066345,10.1408 1.7000984,8.9987193 2.2451,8.0813563 2.9701454,7.3577133 3.8775958,6.8264783 4.7850461,6.2952433 5.765547,6.0245323 6.82146,6.0072123 c 0.577764,0 1.335424,0.176254 2.276964,0.522648 0.938885,0.347558 1.541736,0.523812 1.806194,0.523812 0.197458,0 0.86731,-0.20609 2.002471,-0.61696 1.073475,-0.381034 1.979745,-0.538803 2.722056,-0.476656 2.011474,0.160098 3.522661,0.942105 4.52766,2.350968 -1.798962,1.074987 -2.688851,2.5806367 -2.671289,4.5121477 0.01638,1.504486 0.569794,2.756308 1.657288,3.750517 0.492907,0.461374 1.043369,0.817956 1.655961,1.071202 -0.132672,0.379724 -0.27287,0.743583 -0.421923,1.092888 z M 15.76344,0.83444129 c 0,1.17919601 -0.43668,2.28023501 -1.307383,3.29933201 -1.050748,1.211506 -2.32168,1.911572 -3.699901,1.801104 -0.01756,-0.141469 -0.02774,-0.29036 -0.02774,-0.446819 0,-1.13204 0.499696,-2.343546 1.387076,-3.334117 0.443026,-0.501544 1.006327,-0.918672 1.689608,-1.25124001 0.681805,-0.327619 1.326716,-0.508966 1.933257,-0.539967 0.01801,0.157624 0.02509,0.315248 0.02509,0.471707 z"
+         id="path4"
+         fill="#ffffff"
+         fill-rule="nonzero"
+         clip-path="none"
+         style="display:inline" /></mask></defs><g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"><g
+       id="dashboard_empty_state_member1_no-pipelines"
+       transform="translate(-823.000000, -510.000000)"><g
+         id="apple_logo_legend_d_ic"
+         transform="translate(817.000000, 507.000000)"><g
+           id="Group-10"><polygon
+             id="Shape"
+             points="0 0 31.8857143 0 31.8857143 32 0 32" /><path
+             d="M26.4292054,21.7434664 C26.067642,22.5672441 25.6395213,23.325527 25.1438105,24.0226817 C24.4679082,24.9729369 23.9144948,25.6309402 23.4878499,25.9964006 C22.8268529,26.5958953 22.1184837,26.9029927 21.3597908,26.9206035 C20.8153796,26.9206035 20.1585147,26.767637 19.3942139,26.4577743 C18.6272566,26.149076 17.9222817,25.9964006 17.2778133,25.9964006 C16.6019111,25.9964006 15.8771608,26.149076 15.1016441,26.4577743 C14.3250944,26.767637 13.6995159,26.9291906 13.2212191,26.9453459 C12.4938125,26.9759101 11.7687671,26.6600801 11.0450499,25.9964006 C10.5831341,25.5990661 10.0053705,24.9179213 9.31323478,23.9528207 C8.57062774,22.9223708 7.96010204,21.7276021 7.48180526,20.3653125 C6.96956579,18.8938651 6.71278195,17.4689917 6.71278195,16.0895279 C6.71278195,14.5093593 7.0589974,13.1464875 7.75246132,12.0044056 C8.29746287,11.0870433 9.02250826,10.3633997 9.92995871,9.832165 C10.8374092,9.30093028 11.8179102,9.03021888 12.873823,9.01289918 C13.4515866,9.01289918 14.2092465,9.18915267 15.1507872,9.53554682 C16.0896716,9.88310532 16.6925233,10.0593588 16.9569811,10.0593588 C17.154439,10.0593588 17.8242906,9.85326885 18.9594523,9.44239881 C20.0329268,9.06136525 20.9391966,8.90359581 21.6815085,8.965743 C23.6929818,9.12584113 25.2041694,9.90784776 26.2091682,11.3167114 C24.4102056,12.3916976 23.5203168,13.8973478 23.5378785,15.828859 C23.5542595,17.3333449 24.107673,18.5851668 25.1951673,19.5793762 C25.6880741,20.0407499 26.238536,20.3973321 26.8511278,20.6505783 C26.7184562,21.0303019 26.5782581,21.3941613 26.4292054,21.7434664 Z M21.8158035,3.84012838 C21.8158035,5.01932393 21.3791234,6.12036248 20.5084196,7.13945989 C19.4576719,8.35096615 18.1867395,9.05103164 16.8085187,8.94056393 C16.7909571,8.79909539 16.7807743,8.65020412 16.7807743,8.49374458 C16.7807743,7.36170521 17.2804697,6.15019895 18.1678497,5.15962811 C18.6108756,4.65808432 19.1741767,4.2409559 19.8574578,3.9083884 C20.5392632,3.5807694 21.1841743,3.39942187 21.7907154,3.36842105 C21.8087198,3.52604495 21.8158035,3.68366884 21.8158035,3.84012838 Z"
+             id="path1"
+             fill="#FFFFFF"
+             fill-rule="nonzero" /></g></g></g></g><metadata
+     id="metadata1"><rdf:RDF><cc:Work
+         rdf:about=""><dc:title>custom_apple_arm_logo</dc:title></cc:Work></rdf:RDF></metadata><style
+     type="text/css"
+     id="style1">.st0{fill-rule:evenodd;clip-rule:evenodd;}</style><path
+     class="st0"
+     d="m 1.240354,17.163278 c 0.4682643,2.877567 1.0705002,5.644843 2.1993871,8.180843 0.7951881,-0.467015 1.6208433,-1.732987 2.1819202,-3.4876 3.2374681,0.409979 5.6277507,-0.949616 7.3779007,-3.648011 2.93896,-1.739536 3.450838,-3.528304 1.466124,-5.370477 L 8.1205769,8.7254748 C 7.7943172,8.5142343 7.9406135,8.5968926 7.4823241,8.440909 L 6.4444518,8.0876049 C 5.9186102,7.7096863 5.4586007,7.7388276 5.0539135,8.1060913 L 4.1183674,8.9002678 C 3.535494,9.4555388 3.4878952,9.9102634 3.965795,10.267072 l 0.5453187,0.395733 c 0.3558273,0.370031 0.7131787,0.461451 1.0718213,0.07773 l 0.05655,-0.04751 C 5.6171306,10.668245 5.6003927,10.637112 5.5952679,10.60125 5.5777152,10.491799 5.5625208,10.388159 5.5488017,10.294768 5.509387,10.0288 5.4848964,9.862511 5.4592854,9.8363562 c -0.01833,-0.018285 -0.076569,0.118044 -0.3233927,0.3571288 -0.071089,0.06835 -0.1841772,0.06703 -0.2525212,-0.004 -0.068351,-0.07109 -0.067071,-0.18416 0.00404,-0.2525192 0.4304455,-0.4171052 0.6384283,-0.5454072 0.8296019,-0.3495019 0.1059138,0.1099864 0.1367539,0.3184403 0.1860256,0.6549651 0.00884,0.06149 0.018389,0.128103 0.030811,0.201678 l 0.037999,-0.03313 -0.044238,0.04109 c 0.8822196,-0.818508 0.9517239,-0.156656 2.0562825,0.592512 1.3786545,0.935597 2.4592273,2.28037 3.2057133,4.085628 C 9.0601474,14.441385 7.2658999,15.228126 5.682677,16.94033 4.2474145,16.208195 2.764584,16.32945 1.2404107,17.163239 Z"
+     id="path1-1"
+     style="stroke-width:0.125545"
+     mask="url(#mask4)" /></svg>