#75 fixed some problem with Repository model.

artzub · Feb 3, 2022 · 24cc0dd · 24cc0dd
1 parent 7919ac5
commit 24cc0dd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/components/Header/components/RepositoryStep/Header.jsx b/src/components/Header/components/RepositoryStep/Header.jsx
@@ -14,12 +14,12 @@ const onClick = (event) => event.stopPropagation();
 
 const Header = (props) => {
   const { selected } = useSelector(slice.selectors.getState);
-  const { name, private: locked, fork, html_url } = selected || {};
+  const { name, isPrivate, isFork, url } = selected || {};
 
   return (
     <Container {...props}>
-      {locked ? <BookLockIcon size={20} /> : (
-        fork
+      {isPrivate ? <BookLockIcon size={20} /> : (
+        isFork
           ? <SourceRepositoryIcon size={20} />
           : <BookIcon size={20} />
       )}
@@ -30,7 +30,7 @@ const Header = (props) => {
             <Link
               target="_blank"
               onClick={onClick}
-              href={html_url}
+              href={url}
               title="On github"
               style={{ verticalAlign: 'middle', marginRight: '3px' }}
             >

diff --git a/src/models/Repository.js b/src/models/Repository.js
@@ -2,6 +2,7 @@ export const Repository = ({
   id,
   name,
   description,
+  defaultBranch,
   url,
   language,
   forks = 0,
@@ -12,14 +13,15 @@ export const Repository = ({
   isPrivate,
   isArchived,
   isLocked,
-  updateAt,
-  createAt,
+  updatedAt,
+  createdAt,
   pushedAt,
   ...rest
 }) => ({
   id,
   name,
   description,
+  defaultBranch,
   url,
   language: language || 'multi',
   forks,
@@ -30,8 +32,8 @@ export const Repository = ({
   isPrivate,
   isArchived,
   isLocked,
-  updateAt,
-  createAt,
+  updatedAt,
+  createdAt,
   pushedAt,
   mics: rest,
 });
diff --git a/src/redux/api/github/transforms.js b/src/redux/api/github/transforms.js
@@ -10,7 +10,7 @@ export const repository = (item) => Repository({
   isFork: item.fork,
   isArchived: item.archived,
   isLocked: item.disabled,
-  updateAt: Date.parse(item.update_at),
-  createAt: Date.parse(item.create_at),
+  updatedAt: Date.parse(item.updated_at),
+  createdAt: Date.parse(item.created_at),
   pushedAt: Date.parse(item.pushed_at),
 });