refactor: remove organization option

lib/screens/search.dart

@@ -136,10 +136,7 @@ class _SearchScreenState extends State<SearchScreen> {
       case 0:
         return RepositoryItem(data);
       case 1:
-        return UserItem.fromData(
-          data,
-          isOrganization: data['__typename'] == 'Organization',
-        );
+        return UserItem.fromData(data);
       case 2:
       default:
         return IssueItem(

lib/screens/user.dart

@@ -22,15 +22,16 @@ import 'package:primer/primer.dart';
 
 class UserScreen extends StatelessWidget {
   final String login;
-  final bool isOrganization;
 
-  UserScreen(this.login, {this.isOrganization = false});
+  UserScreen(this.login);
 
-  Future queryUser(BuildContext context) async {
+  Future _query(BuildContext context) async {
     var _login = login ?? Provider.of<AuthModel>(context).activeAccount.login;
     var data = await Provider.of<AuthModel>(context).query('''
 {
-  user(login: "$_login") {
+  repositoryOwner(login: "$_login") {
+    __typename
+    ... on User {
       $userGqlChunk
       company
       location
@@ -62,16 +63,7 @@ class UserScreen extends StatelessWidget {
       viewerIsFollowing
       url
     }
-}
-''');
-    return data['user'];
-  }
-
-  Future queryOrganization(BuildContext context) async {
-    // Use pinnableItems instead of organization here due to token permission
-    var data = await Provider.of<AuthModel>(context).query('''
-{
-  organization(login: "$login") {
+    ... on Organization {
       login
       name
       avatarUrl
@@ -100,11 +92,13 @@ class UserScreen extends StatelessWidget {
       }
     }
   }
-''');
-    return data['organization'];
+}
+'''); // Use pinnableItems instead of organization here due to token permission
+
+    return data['repositoryOwner'];
   }
 
-  Future<List<ContributionsInfo>> fetchContributions(
+  Future<List<ContributionsInfo>> _fetchContributions(
       BuildContext context) async {
     var _login = login ?? Provider.of<AuthModel>(context).activeAccount.login;
     switch (Provider.of<AuthModel>(context).activeAccount.platform) {
@@ -123,34 +117,22 @@ class UserScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     return RefreshStatefulScaffold(
       fetchData: () {
-        return Future.wait(
-          isOrganization
-              ? [
-                  queryOrganization(context),
-                  Future.value([].cast<ContributionsInfo>())
-                ]
-              : [
-                  queryUser(context),
-                  fetchContributions(context),
-                ],
-        );
+        return Future.wait([
+          _query(context),
+          _fetchContributions(context),
+        ]);
       },
-      title: AppBarTitle(isOrganization ? 'Organization' : 'User'),
+      title: AppBarTitle('User'), // TODO:
       actionBuilder: (payload) {
         var data = payload.data;
-
-        if (isOrganization) {
+        if (data == null)
           return ActionButton(
-            title: 'Organization Actions',
-            items: [
-              if (data != null) ...[
-                ActionItem.share(payload.data[0]['url']),
-                ActionItem.launch(payload.data[0]['url']),
-              ],
-            ],
+            title: "Actions",
+            items: [],
           );
-        }
 
+        switch (data[0]['__typename']) {
+          case 'User':
             if (login == null) {
               return ActionEntry(
                 iconData: Icons.settings,
@@ -166,7 +148,8 @@ class UserScreen extends StatelessWidget {
                 items: [
                   if (data != null && data[0]['viewerCanFollow'])
                     ActionItem(
-                  text: data[0]['viewerIsFollowing'] ? 'Unfollow' : 'Follow',
+                      text:
+                          data[0]['viewerIsFollowing'] ? 'Unfollow' : 'Follow',
                       onPress: () async {
                         if (data[0]['viewerIsFollowing']) {
                           await Provider.of<AuthModel>(context)
@@ -186,10 +169,26 @@ class UserScreen extends StatelessWidget {
                 ],
               );
             }
+            break;
+          case 'Organization':
+            return ActionButton(
+              title: 'Organization Actions',
+              items: [
+                if (data != null) ...[
+                  ActionItem.share(payload.data[0]['url']),
+                  ActionItem.launch(payload.data[0]['url']),
+                ],
+              ],
+            );
+          default:
+            return null;
+        }
       },
       bodyBuilder: (payload) {
         var data = payload.data[0];
         var contributions = payload.data[1];
+        final isOrganization = data['__typename'] == 'Organization';
+
         return Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: <Widget>[

lib/widgets/text_contains_organization.dart

@@ -22,8 +22,8 @@ class TextContainsOrganization extends StatelessWidget {
       if (chunks[index].isNotEmpty) {
         spans.add(TextSpan(text: chunks[index]));
       }
-      spans.add(createLinkSpan(context, orgs[index],
-          (_) => UserScreen(orgs[index].substring(1), isOrganization: true)));
+      spans.add(createLinkSpan(
+          context, orgs[index], (_) => UserScreen(orgs[index].substring(1))));
     }
     if (chunks.last.isNotEmpty) {
       spans.add(TextSpan(text: chunks.last));

lib/widgets/user_item.dart

@@ -19,7 +19,6 @@ class UserItem extends StatelessWidget {
   final String avatarUrl;
   final String bio;
   final bool inUserScreen;
-  final bool isOrganization;
 
   UserItem({
     this.login,
@@ -27,11 +26,9 @@ class UserItem extends StatelessWidget {
     this.avatarUrl,
     this.bio,
     this.inUserScreen = false,
-    this.isOrganization = false,
   });
   UserItem.fromData(
     data, {
-    this.isOrganization = false,
     this.inUserScreen = false,
   })  : login = data['login'],
         name = data['name'],
@@ -41,9 +38,7 @@ class UserItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Link(
-      screenBuilder: inUserScreen
-          ? null
-          : (_) => UserScreen(login, isOrganization: isOrganization),
+      screenBuilder: inUserScreen ? null : (_) => UserScreen(login),
       child: Container(
         padding: CommonStyle.padding,
         child: Row(