refactor: unify the repository structure (#789)

* refactor: we only take repoId as entry point

* refactor: adapt Rest schema to match GQL, merge catalogs

* refactor: Make Repository screen only accept a repoId parameter

* revert: remove unwanted commit

* refactor: simplify navigate to repo

* fix: fix repository screen params

* fix: use correct attribute

Author: machour

src/api/schemas/events.js

@@ -1,8 +1,14 @@
 import { schema } from 'normalizr';
+import { repoSchema } from './repos';
 
 export const eventSchema = new schema.Entity(
   'events',
-  {},
+  {
+    repo: repoSchema,
+    payload: {
+      forkee: repoSchema,
+    },
+  },
   {
     idAttribute: event => event.id,
   }

src/api/schemas/gql-repos.js

@@ -1,7 +1,7 @@
 import { schema } from 'normalizr';
 
 export const gqlRepoSchema = new schema.Entity(
-  'gqlRepos',
+  'repos',
   {},
   {
     idAttribute: ({ repository }) => {

src/api/schemas/repos.js

@@ -1,9 +1,62 @@
 import { schema } from 'normalizr';
+import { languageColors } from 'config';
+
+const minV3 = repo => ({
+  id: repo.id,
+  name: repo.name.split('/')[0],
+  nameWithOwner: repo.name,
+  // TODO: Remove me once the transition is done
+  '----------------': '-------------------',
+  full_name: repo.name,
+  url: `https://api.github.com/repos/${repo.name}`,
+});
+
+const fullV3 = repo => {
+  return {
+    id: repo.id,
+    name: repo.name,
+    nameWithOwner: repo.full_name,
+    isFork: repo.fork,
+    description: repo.description,
+    forkCount: repo.forks_count,
+    isPrivate: repo.private,
+    primaryLanguage: repo.language
+      ? {
+          name: repo.language,
+          color: languageColors[repo.language],
+        }
+      : null,
+    stargazers: {
+      totalCount: repo.stargazers_count,
+    },
+    defaultBranchRef: {
+      name: repo.default_branch,
+    },
+    // TODO: Remove me once the transition is done
+    '----------------': '-------------------',
+    full_name: repo.full_name,
+    fork: repo.fork,
+    private: repo.private,
+    forks_count: repo.forks_count,
+    language: repo.language,
+    stargazers_count: repo.stargazers_count,
+    url: `https://api.github.com/repos/${repo.full_name}`,
+  };
+};
 
 export const repoSchema = new schema.Entity(
   'repos',
   {},
   {
-    idAttribute: repo => repo.full_name.toLowerCase(),
+    idAttribute: repo =>
+      (repo.full_name ? repo.full_name : repo.name).toLowerCase(),
+    processStrategy: repo => {
+      if (repo.full_name) {
+        // full v3
+        return fullV3(repo);
+      }
+
+      return minV3(repo);
+    },
   }
 );

src/auth/screens/events.screen.js

@@ -15,7 +15,7 @@ const mapStateToProps = state => {
   const {
     auth: { user, locale },
     pagination: { ACTIVITY_GET_EVENTS_RECEIVED },
-    entities: { events },
+    entities: { events, repos },
   } = state;
 
   const userEventsPagination = ACTIVITY_GET_EVENTS_RECEIVED[user.login] || {
@@ -25,6 +25,7 @@ const mapStateToProps = state => {
 
   return {
     user,
+    repos,
     userEventsPagination,
     userEvents,
     locale,
@@ -126,10 +127,12 @@ class Events extends Component {
     );
   }
 
-  getRepoLink(userEvent) {
+  getRepoLink(userEvent, isFork = false) {
+    const repoId = isFork ? userEvent.payload.forkee : userEvent.repo;
+
     return (
-      <LinkDescription onPress={() => this.navigateToRepository(userEvent)}>
-        {userEvent.repo.name}
+      <LinkDescription onPress={() => this.navigateToRepository(repoId)}>
+        {this.props.repos[repoId].nameWithOwner}
       </LinkDescription>
     );
   }
@@ -256,13 +259,7 @@ class Events extends Component {
   handleForkEvent(userEvent) {
     const actor = this.getActorLink(userEvent);
     const repo = this.getRepoLink(userEvent);
-    const fork = (
-      <LinkDescription
-        onPress={() => this.navigateToRepository(userEvent, true)}
-      >
-        {userEvent.payload.forkee.full_name}
-      </LinkDescription>
-    );
+    const fork = this.getRepoLink(userEvent, true);
 
     return t('{actor} forked {repo} at {fork}', this.props.locale, {
       actor,
@@ -540,16 +537,9 @@ class Events extends Component {
     },
   });
 
-  navigateToRepository = (userEvent, isForkEvent) => {
+  navigateToRepository = repoId => {
     this.props.navigation.navigate('Repository', {
-      repository: !isForkEvent
-        ? {
-            ...userEvent.repo,
-            name: userEvent.repo.name.substring(
-              userEvent.repo.name.indexOf('/') + 1
-            ),
-          }
-        : userEvent.payload.forkee,
+      repoId,
     });
   };
 

src/auth/screens/privacy-policy.screen.js

@@ -5,7 +5,6 @@ import { ScrollView } from 'react-native';
 import { ViewContainer } from 'components';
 import { t } from 'utils';
 import { colors, fonts, normalize } from 'config';
-import { v3 } from 'api';
 
 const Container = styled.View`
   flex: 1;
@@ -139,7 +138,7 @@ export class PrivacyPolicyScreen extends Component {
                 <Link
                   onPress={() =>
                     navigation.navigate('Repository', {
-                      repositoryUrl: `${v3.root}/repos/gitpoint/git-point`,
+                      repoId: 'gitpoint/git-point',
                     })
                   }
                 >

src/components/repository-list-item.component.js

@@ -139,7 +139,9 @@ export const RepositoryListItem = ({
       color: colors.grey,
       type: 'octicon',
     }}
-    onPress={() => navigation.navigate('Repository', { repository })}
+    onPress={() =>
+      navigation.navigate('Repository', { repoId: repository.full_name })
+    }
   />
 );
 

src/issue/screens/issue.screen.js

@@ -21,7 +21,7 @@ import {
   IssueEventListItem,
 } from 'components';
 import { v3 } from 'api';
-import { t, formatEventsToRender, openURLInView } from 'utils';
+import { t, formatEventsToRender, openURLInView, getRepoIdFromUrl } from 'utils';
 import { colors } from 'config';
 import { getRepository, getContributors } from 'repository';
 import {
@@ -179,7 +179,7 @@ class Issue extends Component {
     const { navigation } = this.props;
 
     navigation.navigate('Repository', {
-      repositoryUrl: url,
+      repoId: getRepoIdFromUrl(url),
     });
   };
 

src/notifications/screens/notifications.screen.js

@@ -7,7 +7,6 @@ import { bindActionCreators } from 'redux';
 import { FlatList, View, ScrollView, Platform } from 'react-native';
 import { ButtonGroup, Card, Icon } from 'react-native-elements';
 
-import { v3 } from 'api';
 import {
   Button,
   ViewContainer,
@@ -264,7 +263,7 @@ class Notifications extends Component {
     const { navigation } = this.props;
 
     navigation.navigate('Repository', {
-      repositoryUrl: `${v3.root}/repos/${fullName}`,
+      repoId: fullName,
     });
   };
 
@@ -361,7 +360,7 @@ class Notifications extends Component {
     const { navigation } = this.props;
 
     navigation.navigate('Repository', {
-      repositoryUrl: `${v3.root}/repos/${fullName}`,
+      repoId: fullName,
     });
   };
 

src/repository/screens/repository.screen.js

@@ -30,19 +30,13 @@ import { colors, fonts } from 'config';
 const mapStateToProps = (state, ownProps) => {
   const {
     auth: { user, locale },
-    entities: { gqlRepos, users, repos },
+    entities: { users, repos },
     pagination: { REPOS_GET_CONTRIBUTORS },
   } = state;
 
-  const params = ownProps.navigation.state.params;
+  const repoId = ownProps.navigation.state.params.repoId;
 
-  const repoId =
-    params.repoId ||
-    params.repository.url
-      .replace('https://api.github.com/repos/', '')
-      .toLowerCase();
-
-  const repository = gqlRepos[repoId] || repos[repoId] || params.repository;
+  const repository = repos[repoId];
 
   const contributorsPagination = REPOS_GET_CONTRIBUTORS[repoId] || {
     ids: [],

src/utils/migration-helper.js

@@ -17,3 +17,6 @@ export const toOldIssueFormat = (issue, repoId, isPr = false) => {
     url: `https://api.github.com/repos/${repoId}/issues/${issue.number}`,
   };
 };
+
+export const getRepoIdFromUrl = url =>
+  url.replace(/https:\/\/api.github.com\/repos\/(.+)\/(.+)\/?/, '$1/$2');