From a5b1866a6a534beddf1596f218fc3a677ab5babb Mon Sep 17 00:00:00 2001
From: viktoria-mahmud <111341278+viktoria-mahmud@users.noreply.github.com>
Date: Tue, 9 May 2023 10:32:57 +0300
Subject: [PATCH] Update Additional asset (#1261)

---
 .../components/additional-asset.mustache      |  2 +-
 .../components/additional-asset.yaml          | 11 +++------
 .../components/additional-asset~doi.json      |  6 +++--
 ...upplement-and-additional-assets--nojs.json | 12 ++++++----
 ...with-supplement-and-additional-assets.json | 12 ++++++----
 ...y-figure-with-additional-assets--nojs.json | 24 ++++++++++++-------
 .../components/additional-assets.json         | 12 ++++++----
 .../_patterns/04-pages/article--figures.json  | 12 ++++++----
 8 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/source/_patterns/01-molecules/components/additional-asset.mustache b/source/_patterns/01-molecules/components/additional-asset.mustache
index 778082439..57c2501ef 100644
--- a/source/_patterns/01-molecules/components/additional-asset.mustache
+++ b/source/_patterns/01-molecules/components/additional-asset.mustache
@@ -17,7 +17,7 @@
 
   {{#downloadLink}}
     <div>
-      <a class="additional-asset__link additional-asset__link--download" href="{{url}}"{{#fileName}} download="{{fileName}}"{{/fileName}}>{{{downloadLink.name}}}</a>
+      <a class="additional-asset__link additional-asset__link--download" href="{{link.url}}"{{#fileName}} download="{{fileName}}"{{/fileName}}>{{{link.name}}}</a>
     </div>
   {{/downloadLink}}
 </dd>
diff --git a/source/_patterns/01-molecules/components/additional-asset.yaml b/source/_patterns/01-molecules/components/additional-asset.yaml
index 764de4e6f..c4b29559f 100644
--- a/source/_patterns/01-molecules/components/additional-asset.yaml
+++ b/source/_patterns/01-molecules/components/additional-asset.yaml
@@ -14,18 +14,13 @@ properties:
   downloadLink:
     type: object
     properties:
-      url:
-        type: string
-        minLength: 1
-      name:
-        type: string
-        minLength: 1
+      link:
+        $ref: ../../../non-pattern-schema/link.yaml
       fileName:
         type: string
         minLength: 1
     required:
-      - url
-      - name
+      - link
 allOf:
   -
     required:
diff --git a/source/_patterns/01-molecules/components/additional-asset~doi.json b/source/_patterns/01-molecules/components/additional-asset~doi.json
index 0fd786095..647171cfa 100644
--- a/source/_patterns/01-molecules/components/additional-asset~doi.json
+++ b/source/_patterns/01-molecules/components/additional-asset~doi.json
@@ -11,8 +11,10 @@
   },
 
   "downloadLink": {
-    "url": "#downloadLink",
-    "name": "Download me",
+    "link": {
+      "url": "#",
+      "name": "Download me"
+    },
     "fileName": "#download-me.png"
   }
 }
diff --git a/source/_patterns/02-organisms/asset-viewer/asset-viewer-inline~main-figure-with-supplement-and-additional-assets--nojs.json b/source/_patterns/02-organisms/asset-viewer/asset-viewer-inline~main-figure-with-supplement-and-additional-assets--nojs.json
index f5dae7c28..049f390b6 100644
--- a/source/_patterns/02-organisms/asset-viewer/asset-viewer-inline~main-figure-with-supplement-and-additional-assets--nojs.json
+++ b/source/_patterns/02-organisms/asset-viewer/asset-viewer-inline~main-figure-with-supplement-and-additional-assets--nojs.json
@@ -53,8 +53,10 @@
           },
 
           "downloadLink": {
-            "url": "#downloadLink",
-            "name": "Download me",
+            "link": {
+              "url": "#downloadLink",
+              "name": "Download me"
+            },
             "fileName": "#download-me.png"
           }
         },
@@ -72,8 +74,10 @@
           },
 
           "downloadLink": {
-            "url": "#downloadLink",
-            "name": "Download me",
+            "link": {
+              "url": "#downloadLink",
+              "name": "Download me"
+            },
             "fileName": "#download-me.png"
           }
 
diff --git a/source/_patterns/02-organisms/asset-viewer/asset-viewer-inline~main-figure-with-supplement-and-additional-assets.json b/source/_patterns/02-organisms/asset-viewer/asset-viewer-inline~main-figure-with-supplement-and-additional-assets.json
index 6e7e5e993..ba88b2869 100644
--- a/source/_patterns/02-organisms/asset-viewer/asset-viewer-inline~main-figure-with-supplement-and-additional-assets.json
+++ b/source/_patterns/02-organisms/asset-viewer/asset-viewer-inline~main-figure-with-supplement-and-additional-assets.json
@@ -52,8 +52,10 @@
           },
 
           "downloadLink": {
-            "url": "#downloadLink",
-            "name": "Download me",
+            "link": {
+              "url": "#downloadLink",
+              "name": "Download me"
+            },
             "fileName": "#download-me.png"
           }
         },
@@ -71,8 +73,10 @@
           },
 
           "downloadLink": {
-            "url": "#downloadLink",
-            "name": "Download me",
+            "link": {
+              "url": "#downloadLink",
+              "name": "Download me"
+            },
             "fileName": "#download-me.png"
           }
 
diff --git a/source/_patterns/02-organisms/asset-viewer/asset-viewer-inline~supplementary-figure-with-additional-assets--nojs.json b/source/_patterns/02-organisms/asset-viewer/asset-viewer-inline~supplementary-figure-with-additional-assets--nojs.json
index 06d379326..9b5fb741b 100644
--- a/source/_patterns/02-organisms/asset-viewer/asset-viewer-inline~supplementary-figure-with-additional-assets--nojs.json
+++ b/source/_patterns/02-organisms/asset-viewer/asset-viewer-inline~supplementary-figure-with-additional-assets--nojs.json
@@ -54,8 +54,10 @@
           },
 
           "downloadLink": {
-            "url": "#downloadLink",
-            "name": "Download me",
+            "link": {
+              "url": "#downloadLink",
+              "name": "Download me"
+            },
             "fileName": "#download-me.png"
           }
         },
@@ -73,8 +75,10 @@
           },
 
           "downloadLink": {
-            "url": "#downloadLink",
-            "name": "Download me",
+            "link": {
+              "url": "#downloadLink",
+              "name": "Download me"
+            },
             "fileName": "#download-me.png"
           }
 
@@ -97,8 +101,10 @@
           },
 
           "downloadLink": {
-            "url": "#downloadLink",
-            "name": "Download me",
+            "link": {
+              "url": "#downloadLink",
+              "name": "Download me"
+            },
             "fileName": "#download-me.png"
           }
         },
@@ -116,8 +122,10 @@
           },
 
           "downloadLink": {
-            "url": "#downloadLink",
-            "name": "Download me",
+            "link": {
+              "url": "#downloadLink",
+              "name": "Download me"
+            },
             "fileName": "#download-me.png"
           }
 
diff --git a/source/_patterns/02-organisms/components/additional-assets.json b/source/_patterns/02-organisms/components/additional-assets.json
index 1140a0083..f95089f51 100644
--- a/source/_patterns/02-organisms/components/additional-assets.json
+++ b/source/_patterns/02-organisms/components/additional-assets.json
@@ -11,8 +11,10 @@
       "nonDoiLink": "https://example.com/a-non-doi-link",
 
       "downloadLink": {
-        "url": "#downloadLink",
-        "name": "Download me",
+        "link": {
+          "url": "#downloadLink",
+          "name": "Download me"
+        },
         "fileName": "#download-me.png"
       }
     },
@@ -30,8 +32,10 @@
       },
 
       "downloadLink": {
-        "url": "#downloadLink",
-        "name": "Download me",
+        "link": {
+          "url": "#downloadLink",
+          "name": "Download me"
+        },
         "fileName": "#download-me.png"
       }
     }
diff --git a/source/_patterns/04-pages/article--figures.json b/source/_patterns/04-pages/article--figures.json
index f693ccd1b..9da64dd08 100644
--- a/source/_patterns/04-pages/article--figures.json
+++ b/source/_patterns/04-pages/article--figures.json
@@ -670,8 +670,10 @@
           "nonDoiLink": "https://example.com/a-non-doi-link",
 
           "downloadLink": {
-            "url": "#downloadLink",
-            "name": "Download me",
+            "link": {
+              "url": "#downloadLink",
+              "name": "Download me"
+            },
             "fileName": "#download-me.png"
           }
         },
@@ -688,8 +690,10 @@
           },
 
           "downloadLink": {
-            "url": "#downloadLink",
-            "name": "Download me",
+            "link": {
+              "url": "#downloadLink",
+              "name": "Download me"
+            },
             "fileName": "#download-me.png"
           }
         }