Show all connected accounts

Ability to filter by each connected account independently.

Author: humitos

readthedocs/projects/static-src/projects/js/import.js

@@ -141,7 +141,7 @@ function ProjectImportView (instance, config) {
     self.page_next = ko.observable(null);
     self.page_previous = ko.observable(null);
     self.filter_org = ko.observable(null);
-    self.filter_own = ko.observable(false);
+    self.filter_own = ko.observable(null);
 
     self.organizations_raw = ko.observableArray();
     self.organizations = ko.computed(function () {
@@ -251,9 +251,14 @@ function ProjectImportView (instance, config) {
         self.page_current(null);
     };
 
-    self.set_filter_own = function () {
+    self.set_filter_own = function (account) {
+        var current_account = self.filter_own();
+        if (current_account == account) {
+            account = null;
+        }
+
         // This needs to use deferred updates
-        self.filter_own(true);
+        self.filter_own(account);
         self.filter_org(null);
         self.page_current(null);
     };

readthedocs/restapi/views/model_views.py

@@ -263,7 +263,10 @@ def get_queryset(self):
 
         own = self.request.query_params.get('own', None)
         if own is not None:
-            query = query.filter(organization__isnull=True)
+            query = query.filter(
+                account__provider=own,
+                organization=None,
+            )
 
         query = query.filter(account__provider__in=[service.adapter.provider_id
                                                     for service in registry])

readthedocs/templates/projects/project_import.html

@@ -209,15 +209,24 @@ <h1>{% trans "Import a Repository" %}</h1>
         </div>
       {% endblock %}
 
-      <h3>{% trans "Filter by Own Repositories" %}</h3>
-      <li
-        class="remote-org"
-        data-bind="click: function () { $root.set_filter_own(); }">
-        <!-- TODO: show all the connected accounts here with corresponding avatar -->
-        <span>humitos (GitHub)</span>
-        <!-- <img data-bind="attr: {src: avatar_url}" class="remote-org-avatar" /> -->
-        <!-- <span data-bind="text: display_name" class="remote-org-name"></span> -->
-      </li>
+      {# accounts is a dictionary with the provider as key and a list of connected accounts of that provider #}
+      {% get_social_accounts user as accounts %}
+      {% if accounts %}
+        <h3>{% trans "Filter by Own Repositories" %}</h3>
+        {% for type, list in accounts.items %}
+          {% for account in list %}
+            <li
+              class="remote-org"
+              data-bind="click: function () { $root.set_filter_own('{{ account.provider }}'); }">
+              <img src="{{ account.get_avatar_url }}" class="remote-org-avatar" />
+
+              <!-- TODO: get the proper username for the connected account -->
+              <span>{{ account.user.username }} ({{ account.get_provider_display }})</span>
+
+            </li>
+          {% endfor %}
+        {% endfor %}
+      {% endif %}
 
 
       {% block organizations %}