Merge branch 'main' of github.com:canonical/snapcraft.io into add-model

canonical · Jul 12, 2023 · 68e5968 · 68e5968
2 parents 8293b60 + 6f9749c
commit 68e5968
Show file tree

Hide file tree

Showing 13 changed files with 267 additions and 307 deletions.
diff --git a/package.json b/package.json
@@ -30,9 +30,9 @@
     "@babel/preset-react": "7.18.6",
     "@babel/preset-typescript": "7.21.0",
     "@canonical/cookie-policy": "3.4.0",
-    "@canonical/global-nav": "3.2.4",
+    "@canonical/global-nav": "3.2.5",
     "@canonical/latest-news": "1.4.1",
-    "@canonical/react-components": "0.40.1",
+    "@canonical/react-components": "0.43.0",
     "@dnd-kit/core": "6.0.8",
     "@dnd-kit/sortable": "7.0.2",
     "@dnd-kit/utilities": "3.2.1",
@@ -94,7 +94,7 @@
     "topojson-client": "3.1.0",
     "ts-loader": "9.4.2",
     "typescript": "4.9.5",
-    "vanilla-framework": "4.0.0-alpha.2",
+    "vanilla-framework": "4.0.0",
     "watch-cli": "0.2.3",
     "webpack": "5.76.0",
     "webpack-cli": "5.0.1",
@@ -114,7 +114,7 @@
     "jest": "29.5.0",
     "jest-environment-jsdom": "29.5.0",
     "sass-loader": "13.2.0",
-    "stylelint": "15.2.0",
+    "stylelint": "15.10.1",
     "stylelint-config-standard-scss": "7.0.1",
     "stylelint-order": "6.0.3",
     "ts-jest": "29.0.5"

diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,7 @@ canonicalwebteam.discourse==5.2.4
 canonicalwebteam.blog==6.4.0
 canonicalwebteam.search==1.3.0
 canonicalwebteam.image-template==1.3.1
-canonicalwebteam.store-api==4.2.1
+canonicalwebteam.store-api==4.3.0
 canonicalwebteam.launchpad==0.8.4
 django-openid-auth==0.16
 Flask-OpenID==1.3.0

diff --git a/tests/publisher/snaps/tests_post_settings.py b/tests/publisher/snaps/tests_post_settings.py
@@ -102,7 +102,6 @@ def test_return_error_update_one_field(self):
             "snap_name": self.snap_name,
             "private": True,
             "unlisted": False,
-            "price": 0,
             "store": "stotore",
             "keywords": [],
             "status": "published",
@@ -158,7 +157,6 @@ def test_return_error_update_one_field(self):
         self.assert_context("snap_title", "test snap")
         self.assert_context("snap_name", self.snap_name)
         self.assert_context("private", True)
-        self.assert_context("price", 0)
         self.assert_context("store", "stotore")
         self.assert_context("keywords", [])
         self.assert_context("status", "published")
@@ -184,7 +182,6 @@ def test_return_error_udpate_all_field(self):
             "unlisted": False,
             "public_metrics_enabled": False,
             "public_metrics_blacklist": True,
-            "price": 0,
             "store": "stotore",
             "keywords": [],
             "status": "published",
@@ -240,7 +237,6 @@ def test_return_error_udpate_all_field(self):
         self.assert_context("snap_title", "test snap")
         self.assert_context("snap_name", self.snap_name)
         self.assert_context("private", True)
-        self.assert_context("price", 0)
         self.assert_context("store", "stotore")
         self.assert_context("keywords", [])
         self.assert_context("status", "published")
@@ -277,7 +273,6 @@ def test_return_error_invalid_field(self):
             "unlisted": False,
             "contact": "contact adress",
             "website": "website_url",
-            "price": 0,
             "store": "stotore",
             "keywords": [],
             "status": "published",

diff --git a/tests/publisher/snaps/tests_publicise_badges.py b/tests/publisher/snaps/tests_publicise_badges.py
@@ -21,7 +21,6 @@ class GetPubliciseBadgesPage(BaseTestCases.EndpointLoggedInErrorHandling):
             "description": "this is a description",
             "media": [],
             "license": "license",
-            "prices": 0,
             "publisher": {
                 "display-name": "Toto",
                 "username": "toto",
@@ -44,7 +43,7 @@ def setUp(self):
                 "snaps/info/",
                 snap_name,
                 "?fields=title%2Csummary%2Cdescription%2Clicense%2Ccontact%2C",
-                "website%2Cpublisher%2Cprices%2Cmedia%2Cdownload%2Cversion%2C",
+                "website%2Cpublisher%2Cmedia%2Cdownload%2Cversion%2C",
                 "created-at%2Cconfinement%2Ccategories%2Ctrending%2Cunlisted",
                 "%2Clinks",
             ]

diff --git a/tests/publisher/snaps/tests_settings.py b/tests/publisher/snaps/tests_settings.py
@@ -53,7 +53,6 @@ def test_account_logged_in(self):
             "snap_name": snap_name,
             "private": True,
             "unlisted": False,
-            "price": 0,
             "store": "stotore",
             "keywords": [],
             "status": "published",
@@ -94,7 +93,6 @@ def test_account_logged_in(self):
         self.assert_context("snap_title", "test snap")
         self.assert_context("snap_name", snap_name)
         self.assert_context("private", True)
-        self.assert_context("price", 0)
         self.assert_context("store", "stotore")
         self.assert_context("keywords", [])
         self.assert_context("status", "published")

diff --git a/tests/store/tests_details.py b/tests/store/tests_details.py
@@ -26,7 +26,6 @@ def setUp(self):
                                 "contact",
                                 "website",
                                 "publisher",
-                                "prices",
                                 "media",
                                 "download",
                                 "version",
@@ -111,7 +110,6 @@ def test_no_channel_map(self):
                 "description": "this is a description",
                 "media": [],
                 "license": "license",
-                "prices": 0,
                 "publisher": {
                     "display-name": "Toto",
                     "username": "toto",
@@ -146,7 +144,6 @@ def test_user_connected(self):
                 "description": "this is a description",
                 "media": [],
                 "license": "license",
-                "prices": 0,
                 "publisher": {
                     "display-name": "Toto",
                     "username": "toto",
@@ -212,7 +209,6 @@ def test_user_not_connected(self):
                 "description": "this is a description",
                 "media": [],
                 "license": "license",
-                "prices": 0,
                 "publisher": {
                     "display-name": "Toto",
                     "username": "toto",
@@ -270,7 +266,6 @@ def test_user_connected_on_not_own_snap(self):
                 "description": "this is a description",
                 "media": [],
                 "license": "license",
-                "prices": 0,
                 "publisher": {
                     "display-name": "Toto",
                     "username": "toto",

diff --git a/tests/store/tests_distro_page.py b/tests/store/tests_distro_page.py
@@ -17,7 +17,6 @@ class GetDistroPageTest(TestCase):
             "description": "this is a description",
             "media": [],
             "license": "license",
-            "prices": 0,
             "publisher": {
                 "display-name": "Toto",
                 "username": "toto",
@@ -64,7 +63,6 @@ def setUp(self):
                                 "contact",
                                 "website",
                                 "publisher",
-                                "prices",
                                 "media",
                                 "download",
                                 "version",

diff --git a/tests/store/tests_embedded_card.py b/tests/store/tests_embedded_card.py
@@ -17,7 +17,6 @@ class GetEmbeddedCardTest(TestCase):
             "description": "this is a description",
             "media": [],
             "license": "license",
-            "prices": 0,
             "publisher": {
                 "display-name": "Toto",
                 "username": "toto",
@@ -64,7 +63,6 @@ def setUp(self):
                                 "contact",
                                 "website",
                                 "publisher",
-                                "prices",
                                 "media",
                                 "download",
                                 "version",

diff --git a/tests/store/tests_github_badge.py b/tests/store/tests_github_badge.py
@@ -17,7 +17,6 @@ class GetGitHubBadgeTest(TestCase):
             "description": "this is a description",
             "media": [],
             "license": "license",
-            "prices": 0,
             "publisher": {
                 "display-name": "Toto",
                 "username": "toto",
@@ -77,7 +76,6 @@ def setUp(self):
                                 "contact",
                                 "website",
                                 "publisher",
-                                "prices",
                                 "media",
                                 "download",
                                 "version",

diff --git a/webapp/publisher/snaps/logic.py b/webapp/publisher/snaps/logic.py
@@ -275,7 +275,6 @@ def filter_changes_data(changes):
         "website",
         "keywords",
         "license",
-        "price",
         "private",
         "unlisted",
         "blacklist_countries",

diff --git a/webapp/publisher/snaps/settings_views.py b/webapp/publisher/snaps/settings_views.py
@@ -64,7 +64,6 @@ def get_settings(snap_name, return_json=False):
         "countries": countries,
         "whitelist_country_codes": whitelist_country_codes,
         "blacklist_country_codes": blacklist_country_codes,
-        "price": snap_details["price"],
         "store": snap_details["store"],
         "keywords": snap_details["keywords"],
         "status": snap_details["status"],
@@ -171,7 +170,6 @@ def post_settings(snap_name, return_json=False):
                 "countries": countries,
                 "whitelist_country_codes": whitelist_country_codes,
                 "blacklist_country_codes": blacklist_country_codes,
-                "price": snap_details["price"],
                 "store": snap_details["store"],
                 "keywords": snap_details["keywords"],
                 "status": snap_details["status"],

diff --git a/webapp/store/snap_details_views.py b/webapp/store/snap_details_views.py
@@ -122,7 +122,6 @@ def _get_context_snap_details(snap_name):
             "publisher_snaps": publisher_snaps,
             "publisher_featured_snaps": publisher_featured_snaps,
             "has_publisher_page": publisher_info is not None,
-            "prices": details["snap"]["prices"],
             "contact": details["snap"].get("contact"),
             "website": details["snap"].get("website"),
             "summary": details["snap"]["summary"],