Merge ~pappacena/launchpad:snap-project-links into launchpad:master

[Thiago F. Pappacena]

Adding +new-snap link to project page

This is a complementary MP for the +new-snap page on project (https://code.launchpad.net/~pappacena/launchpad/+git/launchpad/+merge/399184)

[Colin Watson (cjwatson)]

review: Approve

[Otto Co-Pilot (otto-copilot)]

Merging failed
https://jenkins.ols.canonical.com/online-services/job/launchpad/1501/

diff --git a/lib/lp/code/browser/tests/test_product.py b/lib/lp/code/browser/tests/test_product.py
index 2115eb5..61a6240 100644
--- a/lib/lp/code/browser/tests/test_product.py
+++ b/lib/lp/code/browser/tests/test_product.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for the product view classes and templates."""
@@ -430,14 +430,39 @@ class TestCanConfigureBranches(TestCaseWithFactory):
         self.assertTrue(view.can_configure_branches())
 
 
-class TestProductOverviewOCIProject(TestCaseWithFactory):
+class TestProductOverviewLinks(TestCaseWithFactory):
 
     layer = DatabaseFunctionalLayer
 
     def setUp(self, user=ANONYMOUS):
-        super(TestProductOverviewOCIProject, self).setUp(user)
+        super(TestProductOverviewLinks, self).setUp(user)
         self.useFixture(FeatureFixture({OCI_PROJECT_ALLOW_CREATE: True}))
 
+    def test_displays_create_and_list_snaps(self):
+        project = self.factory.makeProduct()
+        self.factory.makeSnap(project=project)
+
+        browser = self.getUserBrowser(
+            canonical_url(project), user=project.owner)
+        text = extract_text(
+            find_tag_by_id(browser.contents, 'project-link-info'))
+
+        # Search link should be available because we have an Snap created.
+        self.assertIn("View snap packages", text)
+        self.assertIn("Create snap package", text)
+
+    def test_hides_list_snaps_if_no_snap_is_available(self):
+        project = self.factory.makeProduct()
+
+        browser = self.getUserBrowser(
+            canonical_url(project), user=project.owner)
+        text = extract_text(
+            find_tag_by_id(browser.contents, 'project-link-info'))
+
+        # Search link should not be available.
+        self.assertNotIn("View snap packages", text)
+        self.assertIn("Create snap package", text)
+
     def test_displays_create_and_list_oci_project_link_for_owner(self):
         product = self.factory.makeProduct()
         self.factory.makeOCIProject(pillar=product)
diff --git a/lib/lp/registry/browser/product.py b/lib/lp/registry/browser/product.py
index 780c236..df7ee7a 100644
--- a/lib/lp/registry/browser/product.py
+++ b/lib/lp/registry/browser/product.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Browser views for products."""
@@ -233,6 +233,7 @@ from lp.services.webapp.vhosts import allvhosts
 from lp.services.worlddata.helpers import browser_languages
 from lp.services.worlddata.interfaces.country import ICountry
 from lp.snappy.browser.hassnaps import HasSnapsMenuMixin
+from lp.snappy.interfaces.snap import ISnapSet
 from lp.translations.browser.customlanguagecode import (
     HasCustomLanguageCodesTraversalMixin,
     )
@@ -585,6 +586,7 @@ class ProductOverviewMenu(ApplicationMenu, ProductEditLinksMixin,
         'branding',
         'view_recipes',
         'view_snaps',
+        'create_snap',
         ]
 
     def top_contributors(self):
diff --git a/lib/lp/registry/templates/product-index.pt b/lib/lp/registry/templates/product-index.pt
index a22574c..73d339b 100644
--- a/lib/lp/registry/templates/product-index.pt
+++ b/lib/lp/registry/templates/product-index.pt
@@ -168,7 +168,7 @@
               <a tal:replace="structure overview_menu/edit/fmt:icon" />
             </p>
 
-            <ul class="horizontal">
+            <ul class="horizontal" id="project-link-info">
               <li tal:condition="overview_menu/series_add/enabled">
                 <a tal:replace="structure overview_menu/series_add/fmt:link" />
               </li>
@@ -183,6 +183,10 @@
                   tal:condition="link/enabled">
                 <a tal:replace="structure link/fmt:link" />
               </li>
+              <li tal:define="link context/menu:overview/create_snap"
+                  tal:condition="link/enabled">
+                <a tal:replace="structure link/fmt:link" />
+              </li>
             </ul>
           </div>
         </div>
diff --git a/lib/lp/snappy/browser/snap.py b/lib/lp/snappy/browser/snap.py
index d189323..c8c2edb 100644
--- a/lib/lp/snappy/browser/snap.py
+++ b/lib/lp/snappy/browser/snap.py
@@ -143,16 +143,19 @@ class SnapNavigation(WebhookTargetNavigationMixin, Navigation):
 class SnapFormMixin:
     def validateVCSWidgets(self, cls, data):
         """Validates if VCS sub-widgets."""
-        # Set widgets as required or optional depending on the vcs field.
-        vcs = data.get('vcs')
-        if vcs == VCSType.BZR:
-            self.widgets['branch'].context.required = True
-            self.widgets['git_ref'].context.required = False
-        elif vcs == VCSType.GIT:
-            self.widgets['branch'].context.required = False
-            self.widgets['git_ref'].context.required = True
-        else:
-            raise AssertionError("Unknown branch type %s" % vcs)
+        if self.widgets.get('vcs') is not None:
+            # Set widgets as required or optional depending on the vcs
+            # field.
+            super(cls, self).validate_widgets(data, ['vcs'])
+            vcs = data.get('vcs')
+            if vcs == VCSType.BZR:
+                self.widgets['branch'].context.required = True
+                self.widgets['git_ref'].context.required = False
+            elif vcs == VCSType.GIT:
+                self.widgets['branch'].context.required = False
+                self.widgets['git_ref'].context.required = True
+            else:
+                raise AssertionError("Unknown branch type %s" % vcs)
 
     def setUpVCSWidgets(self):
         widget = self.widgets.get('vcs')
@@ -570,7 +573,7 @@ class SnapAddView(LaunchpadFormView, SnapAuthorizeMixin, EnableProcessorsMixin,
         self.widgets['processors'].widget_class = 'processors'
         if self.is_project_context:
             # If we are on Project:+new-snap page, we know which information
-            # types the project supports. Let's filter out the ones that are
+            # types the project supports. Let's filter our the ones that are
             # not supported.
             types = getUtility(ISnapSet).getPossibleSnapInformationTypes(
                     self.context)
@@ -630,9 +633,7 @@ class SnapAddView(LaunchpadFormView, SnapAuthorizeMixin, EnableProcessorsMixin,
 
     def validate_widgets(self, data, names=None):
         """See `LaunchpadFormView`."""
-        if self.widgets.get('vcs') is not None:
-            super(SnapAddView, self).validate_widgets(data, ['vcs'])
-            self.validateVCSWidgets(SnapAddView, data)
+        self.validateVCSWidgets(SnapAddView, data)
         if self.widgets.get('auto_build') is not None:
             # Set widgets as required or optional depending on the
             # auto_build field.
@@ -718,9 +719,7 @@ class BaseSnapEditView(LaunchpadEditFormView, SnapAuthorizeMixin,
 
     def validate_widgets(self, data, names=None):
         """See `LaunchpadFormView`."""
-        if self.widgets.get('vcs') is not None:
-            super(BaseSnapEditView, self).validate_widgets(data, ['vcs'])
-            self.validateVCSWidgets(BaseSnapEditView, data)
+        self.validateVCSWidgets(BaseSnapEditView, data)
         if self.widgets.get('auto_build') is not None:
             # Set widgets as required or optional depending on the
             # auto_build field.
diff --git a/lib/lp/snappy/model/snap.py b/lib/lp/snappy/model/snap.py
index 36e8a56..eeed37b 100644
--- a/lib/lp/snappy/model/snap.py
+++ b/lib/lp/snappy/model/snap.py
@@ -1393,7 +1393,6 @@ class SnapSet:
         """See `ISnapSet`."""
         return BRANCH_POLICY_ALLOWED_TYPES[project.branch_sharing_policy]
 
-
     def isValidInformationType(self, information_type, owner, branch=None,
                                git_ref=None):
         private = information_type not in PUBLIC_INFORMATION_TYPES
@@ -1479,9 +1478,14 @@ class SnapSet:
                 collection.visibleByUser(visible_by_user),
                 visible_by_user=visible_by_user)
 
+        snaps_for_project = IStore(Snap).find(
+            Snap,
+            Snap.project == project,
+            get_snap_privacy_filter(visible_by_user))
         bzr_collection = removeSecurityProxy(IBranchCollection(project))
         git_collection = removeSecurityProxy(IGitCollection(project))
-        return _getSnaps(bzr_collection).union(_getSnaps(git_collection))
+        return snaps_for_project.union(
+            _getSnaps(bzr_collection)).union(_getSnaps(git_collection))
 
     def findByBranch(self, branch, visible_by_user=None):
         """See `ISnapSet`."""
diff --git a/lib/lp/snappy/templates/snap-new.pt b/lib/lp/snappy/templates/snap-new.pt
index 480d51c..146d2cb 100644
--- a/lib/lp/snappy/templates/snap-new.pt
+++ b/lib/lp/snappy/templates/snap-new.pt
@@ -40,38 +40,41 @@
           <metal:block use-macro="context/@@launchpad_form/widget_row" />
         </tal:widget>
 
-        <tr tal:condition="view/is_project_context">
-          <td>
-            <div>
-              <label for="field.vcs">Source:</label>
-              <table>
-                <tr>
-                  <td>
-                    <label tal:replace="structure view/vcs_bzr_radio" />
-                    <table class="subordinate">
-                      <tal:widget define="widget nocall:view/widgets/branch">
-                        <metal:block
-                       use-macro="context/@@launchpad_form/widget_row" />
-                      </tal:widget>
-                    </table>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <label tal:replace="structure view/vcs_git_radio" />
-                    <table class="subordinate">
-                      <tal:widget define="widget
-                      nocall:view/widgets/git_ref">
-                        <metal:block
-                       use-macro="context/@@launchpad_form/widget_row" />
-                      </tal:widget>
-                    </table>
-                  </td>
-                </tr>
-              </table>
-            </div>
-          </td>
-        </tr>
+        <tal:guard condition="view/is_project_context">
+          <tr>
+            <td>
+              <div>
+                <label for="field.vcs">Source:</label>
+                <table>
+                  <tr>
+                    <td>
+                      <label tal:replace="structure view/vcs_bzr_radio" />
+                      <table class="subordinate">
+                        <tal:widget define="widget nocall:view/widgets/branch">
+                          <metal:block
+                         use-macro="context/@@launchpad_form/widget_row" />
+                        </tal:widget>
+                      </table>
+                    </td>
+                  </tr>
+
+                  <tr>
+                    <td>
+                      <label tal:replace="structure view/vcs_git_radio" />
+                      <table class="subordinate">
+                        <tal:widget define="widget
+                        nocall:view/widgets/git_ref">
+                          <metal:block
+                         use-macro="context/@@launchpad_form/widget_row" />
+                        </tal:widget>
+                      </table>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+            </td>
+          </tr>
+        </tal:guard>
 
         <tal:widget define="widget nocall:view/widgets/store_distro_series">
           <metal:block use-macro="context/@@launchpad_form/widget_row" />
diff --git a/lib/lp/snappy/tests/test_snap.py b/lib/lp/snappy/tests/test_snap.py
index 0c6f68e..5f9ba74 100644
--- a/lib/lp/snappy/tests/test_snap.py
+++ b/lib/lp/snappy/tests/test_snap.py
@@ -1752,7 +1752,8 @@ class TestSnapSet(TestCaseWithFactory):
 
     def test_findByProject(self):
         # ISnapSet.findByProject returns all Snaps based on branches or
-        # repositories for the given project.
+        # repositories for the given project, and snaps associated directly
+        # to the project.
         projects = [self.factory.makeProduct() for i in range(2)]
         snaps = []
         for project in projects:
@@ -1760,14 +1761,15 @@ class TestSnapSet(TestCaseWithFactory):
                 branch=self.factory.makeProductBranch(product=project)))
             [ref] = self.factory.makeGitRefs(target=project)
             snaps.append(self.factory.makeSnap(git_ref=ref))
+            snaps.append(self.factory.makeSnap(project=project))
         snaps.append(self.factory.makeSnap(
             branch=self.factory.makePersonalBranch()))
         [ref] = self.factory.makeGitRefs(target=None)
         snaps.append(self.factory.makeSnap(git_ref=ref))
         snap_set = getUtility(ISnapSet)
-        self.assertContentEqual(snaps[:2], snap_set.findByProject(projects[0]))
+        self.assertContentEqual(snaps[:3], snap_set.findByProject(projects[0]))
         self.assertContentEqual(
-            snaps[2:4], snap_set.findByProject(projects[1]))
+            snaps[3:6], snap_set.findByProject(projects[1]))
 
     def test_findByBranch(self):
         # ISnapSet.findByBranch returns all Snaps with the given Bazaar branch.