From 0a0169ecd967208e7ec151855b6df7a775eaf822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20So=C3=B3s?= Date: Tue, 13 Feb 2024 11:24:07 +0100 Subject: [PATCH] Always display pubspec URLs (optionally updated from verified URLs). (#7474) --- app/lib/package/models.dart | 39 ++++++++++--------- .../golden/pkg_activity_log_page.html | 4 ++ app/test/frontend/golden/pkg_admin_page.html | 4 ++ .../frontend/golden/pkg_changelog_page.html | 4 ++ .../frontend/golden/pkg_example_page.html | 4 ++ .../frontend/golden/pkg_install_page.html | 4 ++ app/test/frontend/golden/pkg_score_page.html | 4 ++ app/test/frontend/golden/pkg_show_page.html | 4 ++ .../golden/pkg_show_page_discontinued.html | 8 ++++ .../golden/pkg_show_page_flutter_plugin.html | 4 ++ .../golden/pkg_show_page_publisher.html | 4 ++ ..._page_retracted_non_retracted_version.html | 8 ++++ .../golden/pkg_show_version_page.html | 4 ++ .../frontend/golden/pkg_versions_page.html | 4 ++ .../testdata/goldens/packages/oxygen.html | 18 ++++++++- .../goldens/packages/oxygen/changelog.html | 18 ++++++++- .../goldens/packages/oxygen/example.html | 22 +++++++++-- .../goldens/packages/oxygen/install.html | 18 ++++++++- .../goldens/packages/oxygen/license.html | 18 ++++++++- .../goldens/packages/oxygen/score.html | 18 ++++++++- .../goldens/packages/oxygen/versions.html | 18 ++++++++- .../packages/oxygen/versions/1.0.0.html | 18 ++++++++- .../oxygen/versions/1.0.0/changelog.html | 18 ++++++++- .../oxygen/versions/1.0.0/example.html | 22 +++++++++-- .../oxygen/versions/1.0.0/install.html | 18 ++++++++- .../oxygen/versions/1.0.0/license.html | 18 ++++++++- .../packages/oxygen/versions/1.0.0/score.html | 18 ++++++++- .../packages/oxygen/versions/2.0.0.html | 18 ++++++++- 28 files changed, 311 insertions(+), 48 deletions(-) diff --git a/app/lib/package/models.dart b/app/lib/package/models.dart index c8855de65..b87e687af 100644 --- a/app/lib/package/models.dart +++ b/app/lib/package/models.dart @@ -1080,30 +1080,33 @@ class PackagePageData { bool get isLatestStable => version.version == package.latestVersion; late final packageLinks = () { - // Trying to use verfied URLs - final result = scoreCard.panaReport?.result; - if (result != null) { - final baseUrl = urls.inferBaseUrl( - homepageUrl: result.homepageUrl, - repositoryUrl: result.repositoryUrl, - ); - return PackageLinks._( - baseUrl, - homepageUrl: result.homepageUrl, - repositoryUrl: result.repositoryUrl, - issueTrackerUrl: result.issueTrackerUrl, - documentationUrl: result.documentationUrl, - contributingUrl: result.contributingUrl, - ); - } - // Falling back to use URLs from pubspec.yaml. + // start with the URLs from pubspec.yaml final pubspec = version.pubspec!; - return PackageLinks.infer( + final inferred = PackageLinks.infer( homepageUrl: pubspec.homepage, documentationUrl: pubspec.documentation, repositoryUrl: pubspec.repository, issueTrackerUrl: pubspec.issueTracker, ); + + // Use verified URLs when they are available. + final result = scoreCard.panaReport?.result; + if (result == null) { + return inferred; + } + + final baseUrl = urls.inferBaseUrl( + homepageUrl: result.homepageUrl ?? inferred.homepageUrl, + repositoryUrl: result.repositoryUrl ?? inferred.repositoryUrl, + ); + return PackageLinks._( + baseUrl, + homepageUrl: result.homepageUrl ?? inferred.homepageUrl, + repositoryUrl: result.repositoryUrl ?? inferred.repositoryUrl, + issueTrackerUrl: result.issueTrackerUrl ?? inferred.issueTrackerUrl, + documentationUrl: result.documentationUrl ?? inferred.documentationUrl, + contributingUrl: result.contributingUrl ?? inferred.contributingUrl, + ); }(); /// The verified repository (or homepage). diff --git a/app/test/frontend/golden/pkg_activity_log_page.html b/app/test/frontend/golden/pkg_activity_log_page.html index f5078c860..e41dfc5c9 100644 --- a/app/test/frontend/golden/pkg_activity_log_page.html +++ b/app/test/frontend/golden/pkg_activity_log_page.html @@ -388,6 +388,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

@@ -462,6 +464,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

diff --git a/app/test/frontend/golden/pkg_admin_page.html b/app/test/frontend/golden/pkg_admin_page.html index a909a61c6..14072bb73 100644 --- a/app/test/frontend/golden/pkg_admin_page.html +++ b/app/test/frontend/golden/pkg_admin_page.html @@ -591,6 +591,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

@@ -665,6 +667,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

diff --git a/app/test/frontend/golden/pkg_changelog_page.html b/app/test/frontend/golden/pkg_changelog_page.html index 24b8447bd..43dd4d01c 100644 --- a/app/test/frontend/golden/pkg_changelog_page.html +++ b/app/test/frontend/golden/pkg_changelog_page.html @@ -258,6 +258,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

@@ -333,6 +335,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

diff --git a/app/test/frontend/golden/pkg_example_page.html b/app/test/frontend/golden/pkg_example_page.html index 1172f2d22..38337697c 100644 --- a/app/test/frontend/golden/pkg_example_page.html +++ b/app/test/frontend/golden/pkg_example_page.html @@ -255,6 +255,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

@@ -330,6 +332,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

diff --git a/app/test/frontend/golden/pkg_install_page.html b/app/test/frontend/golden/pkg_install_page.html index 0b0a36045..54c626409 100644 --- a/app/test/frontend/golden/pkg_install_page.html +++ b/app/test/frontend/golden/pkg_install_page.html @@ -281,6 +281,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

@@ -356,6 +358,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

diff --git a/app/test/frontend/golden/pkg_score_page.html b/app/test/frontend/golden/pkg_score_page.html index da3033366..442acd1c3 100644 --- a/app/test/frontend/golden/pkg_score_page.html +++ b/app/test/frontend/golden/pkg_score_page.html @@ -343,6 +343,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

@@ -418,6 +420,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

diff --git a/app/test/frontend/golden/pkg_show_page.html b/app/test/frontend/golden/pkg_show_page.html index 91cbca14a..d1ae838f9 100644 --- a/app/test/frontend/golden/pkg_show_page.html +++ b/app/test/frontend/golden/pkg_show_page.html @@ -258,6 +258,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

@@ -333,6 +335,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

diff --git a/app/test/frontend/golden/pkg_show_page_discontinued.html b/app/test/frontend/golden/pkg_show_page_discontinued.html index e1305f906..56ee7960b 100644 --- a/app/test/frontend/golden/pkg_show_page_discontinued.html +++ b/app/test/frontend/golden/pkg_show_page_discontinued.html @@ -247,8 +247,12 @@

Publisher

Metadata

pkg is awesome

+ Homepage +
Repository (GitHub)
+ View/report issues +
Contributing

@@ -320,8 +324,12 @@

Publisher

Metadata

pkg is awesome

+ Homepage +
Repository (GitHub)
+ View/report issues +
Contributing

diff --git a/app/test/frontend/golden/pkg_show_page_flutter_plugin.html b/app/test/frontend/golden/pkg_show_page_flutter_plugin.html index f85d5713e..1095e8154 100644 --- a/app/test/frontend/golden/pkg_show_page_flutter_plugin.html +++ b/app/test/frontend/golden/pkg_show_page_flutter_plugin.html @@ -247,6 +247,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

@@ -326,6 +328,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

diff --git a/app/test/frontend/golden/pkg_show_page_publisher.html b/app/test/frontend/golden/pkg_show_page_publisher.html index a05eb7972..1b805d186 100644 --- a/app/test/frontend/golden/pkg_show_page_publisher.html +++ b/app/test/frontend/golden/pkg_show_page_publisher.html @@ -249,6 +249,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

@@ -327,6 +329,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

diff --git a/app/test/frontend/golden/pkg_show_page_retracted_non_retracted_version.html b/app/test/frontend/golden/pkg_show_page_retracted_non_retracted_version.html index 77b3455f4..783d1aea0 100644 --- a/app/test/frontend/golden/pkg_show_page_retracted_non_retracted_version.html +++ b/app/test/frontend/golden/pkg_show_page_retracted_non_retracted_version.html @@ -238,8 +238,12 @@

Publisher

Metadata

pkg is awesome

+ Homepage +
Repository (GitHub)
+ View/report issues +
Contributing

@@ -311,8 +315,12 @@

Publisher

Metadata

pkg is awesome

+ Homepage +
Repository (GitHub)
+ View/report issues +
Contributing

diff --git a/app/test/frontend/golden/pkg_show_version_page.html b/app/test/frontend/golden/pkg_show_version_page.html index f5fdacaef..6ec951fb5 100644 --- a/app/test/frontend/golden/pkg_show_version_page.html +++ b/app/test/frontend/golden/pkg_show_version_page.html @@ -252,6 +252,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

@@ -327,6 +329,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

diff --git a/app/test/frontend/golden/pkg_versions_page.html b/app/test/frontend/golden/pkg_versions_page.html index e0242d0dd..769278b99 100644 --- a/app/test/frontend/golden/pkg_versions_page.html +++ b/app/test/frontend/golden/pkg_versions_page.html @@ -361,6 +361,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

@@ -436,6 +438,8 @@

Metadata


Repository (GitHub)
+ View/report issues +
Contributing

diff --git a/app/test/task/testdata/goldens/packages/oxygen.html b/app/test/task/testdata/goldens/packages/oxygen.html index bc5bca466..b4a10a111 100644 --- a/app/test/task/testdata/goldens/packages/oxygen.html +++ b/app/test/task/testdata/goldens/packages/oxygen.html @@ -245,7 +245,14 @@

Publisher

Metadata

oxygen is awesome

-

+

+ Homepage +
+ Repository (GitHub) +
+ View/report issues +
+

Topics

#chemical-element @@ -319,7 +326,14 @@

Publisher

Metadata

oxygen is awesome

-

+

+ Homepage +
+ Repository (GitHub) +
+ View/report issues +
+

Topics

#chemical-element diff --git a/app/test/task/testdata/goldens/packages/oxygen/changelog.html b/app/test/task/testdata/goldens/packages/oxygen/changelog.html index e45993966..9fa6ce983 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/changelog.html +++ b/app/test/task/testdata/goldens/packages/oxygen/changelog.html @@ -251,7 +251,14 @@

Publisher

Metadata

oxygen is awesome

-

+

+ Homepage +
+ Repository (GitHub) +
+ View/report issues +
+

Topics

#chemical-element @@ -325,7 +332,14 @@

Publisher

Metadata

oxygen is awesome

-

+

+ Homepage +
+ Repository (GitHub) +
+ View/report issues +
+

Topics

#chemical-element diff --git a/app/test/task/testdata/goldens/packages/oxygen/example.html b/app/test/task/testdata/goldens/packages/oxygen/example.html index be4fb5776..0d06b6a88 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/example.html +++ b/app/test/task/testdata/goldens/packages/oxygen/example.html @@ -201,7 +201,9 @@

Metadata

- example/example.dart + + example/example.dart + 

                     main() { print('example'); }
@@ -246,7 +248,14 @@ 
Publisher

             

             
Metadata

             
oxygen is awesome

-            

+            

+              Homepage
+              

+              Repository (GitHub)
+              

+              View/report issues
+              

+            

             
Topics

             

               #chemical-element
@@ -320,7 +329,14 @@ 
Publisher

           

           
Metadata

           
oxygen is awesome

-          

+          

+            Homepage
+            

+            Repository (GitHub)
+            

+            View/report issues
+            

+          

           
Topics

           

             #chemical-element
diff --git a/app/test/task/testdata/goldens/packages/oxygen/install.html b/app/test/task/testdata/goldens/packages/oxygen/install.html
index fc22ac082..d05f3944f 100644
--- a/app/test/task/testdata/goldens/packages/oxygen/install.html
+++ b/app/test/task/testdata/goldens/packages/oxygen/install.html
@@ -274,7 +274,14 @@ 
Publisher

             

             
Metadata

             
oxygen is awesome

-            

+            

+              Homepage
+              

+              Repository (GitHub)
+              

+              View/report issues
+              

+            

             
Topics

             

               #chemical-element
@@ -348,7 +355,14 @@ 
Publisher

           

           
Metadata

           
oxygen is awesome

-          

+          

+            Homepage
+            

+            Repository (GitHub)
+            

+            View/report issues
+            

+          

           
Topics

           

             #chemical-element
diff --git a/app/test/task/testdata/goldens/packages/oxygen/license.html b/app/test/task/testdata/goldens/packages/oxygen/license.html
index a919b1b12..4ebda55ef 100644
--- a/app/test/task/testdata/goldens/packages/oxygen/license.html
+++ b/app/test/task/testdata/goldens/packages/oxygen/license.html
@@ -247,7 +247,14 @@ 
Publisher

             

             
Metadata

             
oxygen is awesome

-            

+            

+              Homepage
+              

+              Repository (GitHub)
+              

+              View/report issues
+              

+            

             
Topics

             

               #chemical-element
@@ -321,7 +328,14 @@ 
Publisher

           

           
Metadata

           
oxygen is awesome

-          

+          

+            Homepage
+            

+            Repository (GitHub)
+            

+            View/report issues
+            

+          

           
Topics

           

             #chemical-element
diff --git a/app/test/task/testdata/goldens/packages/oxygen/score.html b/app/test/task/testdata/goldens/packages/oxygen/score.html
index bb99a9fa9..ca59d6edd 100644
--- a/app/test/task/testdata/goldens/packages/oxygen/score.html
+++ b/app/test/task/testdata/goldens/packages/oxygen/score.html
@@ -554,7 +554,14 @@ 
Publisher

             

             
Metadata

             
oxygen is awesome

-            

+            

+              Homepage
+              

+              Repository (GitHub)
+              

+              View/report issues
+              

+            

             
Topics

             

               #chemical-element
@@ -628,7 +635,14 @@ 
Publisher

           

           
Metadata

           
oxygen is awesome

-          

+          

+            Homepage
+            

+            Repository (GitHub)
+            

+            View/report issues
+            

+          

           
Topics

           

             #chemical-element
diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions.html b/app/test/task/testdata/goldens/packages/oxygen/versions.html
index 3f8e835c2..da07a0477 100644
--- a/app/test/task/testdata/goldens/packages/oxygen/versions.html
+++ b/app/test/task/testdata/goldens/packages/oxygen/versions.html
@@ -307,7 +307,14 @@ 
Publisher

             

             
Metadata

             
oxygen is awesome

-            

+            

+              Homepage
+              

+              Repository (GitHub)
+              

+              View/report issues
+              

+            

             
Topics

             

               #chemical-element
@@ -381,7 +388,14 @@ 
Publisher

           

           
Metadata

           
oxygen is awesome

-          

+          

+            Homepage
+            

+            Repository (GitHub)
+            

+            View/report issues
+            

+          

           
Topics

           

             #chemical-element
diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0.html b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0.html
index 3f6e00ad5..5b1981bd7 100644
--- a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0.html
+++ b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0.html
@@ -249,7 +249,14 @@ 
Publisher

             

             
Metadata

             
oxygen is awesome

-            

+            

+              Homepage
+              

+              Repository (GitHub)
+              

+              View/report issues
+              

+            

             
Topics

             

               #chemical-element
@@ -323,7 +330,14 @@ 
Publisher

           

           
Metadata

           
oxygen is awesome

-          

+          

+            Homepage
+            

+            Repository (GitHub)
+            

+            View/report issues
+            

+          

           
Topics

           

             #chemical-element
diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/changelog.html b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/changelog.html
index 50e018e75..38fafdc75 100644
--- a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/changelog.html
+++ b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/changelog.html
@@ -255,7 +255,14 @@ 
Publisher

             

             
Metadata

             
oxygen is awesome

-            

+            

+              Homepage
+              

+              Repository (GitHub)
+              

+              View/report issues
+              

+            

             
Topics

             

               #chemical-element
@@ -329,7 +336,14 @@ 
Publisher

           

           
Metadata

           
oxygen is awesome

-          

+          

+            Homepage
+            

+            Repository (GitHub)
+            

+            View/report issues
+            

+          

           
Topics

           

             #chemical-element
diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/example.html b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/example.html
index cc1d756d1..5046b400b 100644
--- a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/example.html
+++ b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/example.html
@@ -205,7 +205,9 @@ 
Metadata

               

                 

                   

-                    example/example.dart
+                    
+                      example/example.dart
+                    
                   

                   
                     main() { print('example'); }
@@ -250,7 +252,14 @@ 
Publisher

             

             
Metadata

             
oxygen is awesome

-            

+            

+              Homepage
+              

+              Repository (GitHub)
+              

+              View/report issues
+              

+            

             
Topics

             

               #chemical-element
@@ -324,7 +333,14 @@ 
Publisher

           

           
Metadata

           
oxygen is awesome

-          

+          

+            Homepage
+            

+            Repository (GitHub)
+            

+            View/report issues
+            

+          

           
Topics

           

             #chemical-element
diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/install.html b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/install.html
index bda9e6d5f..231c6713f 100644
--- a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/install.html
+++ b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/install.html
@@ -278,7 +278,14 @@ 
Publisher

             

             
Metadata

             
oxygen is awesome

-            

+            

+              Homepage
+              

+              Repository (GitHub)
+              

+              View/report issues
+              

+            

             
Topics

             

               #chemical-element
@@ -352,7 +359,14 @@ 
Publisher

           

           
Metadata

           
oxygen is awesome

-          

+          

+            Homepage
+            

+            Repository (GitHub)
+            

+            View/report issues
+            

+          

           
Topics

           

             #chemical-element
diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/license.html b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/license.html
index bfdc1b371..e3c3b551f 100644
--- a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/license.html
+++ b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/license.html
@@ -251,7 +251,14 @@ 
Publisher

             

             
Metadata

             
oxygen is awesome

-            

+            

+              Homepage
+              

+              Repository (GitHub)
+              

+              View/report issues
+              

+            

             
Topics

             

               #chemical-element
@@ -325,7 +332,14 @@ 
Publisher

           

           
Metadata

           
oxygen is awesome

-          

+          

+            Homepage
+            

+            Repository (GitHub)
+            

+            View/report issues
+            

+          

           
Topics

           

             #chemical-element
diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/score.html b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/score.html
index 3ff83ab2e..62185cb22 100644
--- a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/score.html
+++ b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/score.html
@@ -558,7 +558,14 @@ 
Publisher

             

             
Metadata

             
oxygen is awesome

-            

+            

+              Homepage
+              

+              Repository (GitHub)
+              

+              View/report issues
+              

+            

             
Topics

             

               #chemical-element
@@ -632,7 +639,14 @@ 
Publisher

           

           
Metadata

           
oxygen is awesome

-          

+          

+            Homepage
+            

+            Repository (GitHub)
+            

+            View/report issues
+            

+          

           
Topics

           

             #chemical-element
diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/2.0.0.html b/app/test/task/testdata/goldens/packages/oxygen/versions/2.0.0.html
index bc5bca466..b4a10a111 100644
--- a/app/test/task/testdata/goldens/packages/oxygen/versions/2.0.0.html
+++ b/app/test/task/testdata/goldens/packages/oxygen/versions/2.0.0.html
@@ -245,7 +245,14 @@ 
Publisher

             

             
Metadata

             
oxygen is awesome

-            

+            

+              Homepage
+              

+              Repository (GitHub)
+              

+              View/report issues
+              

+            

             
Topics

             

               #chemical-element
@@ -319,7 +326,14 @@ 
Publisher

           

           
Metadata

           
oxygen is awesome

-          

+          

+            Homepage
+            

+            Repository (GitHub)
+            

+            View/report issues
+            

+          

           
Topics

           

             #chemical-element