refactor: remove duplicate interfaces

Author: fabiovincenzi

src/types/models.ts

@@ -9,7 +9,7 @@ export interface UserData {
   admin?: boolean;
 }
 
-export interface Commit {
+export interface CommitData {
   commitTs?: number;
   message: string;
   committer: string;
@@ -19,3 +19,31 @@ export interface Commit {
   authorEmail: string;
   commitTimestamp?: number;
 }
+
+export interface PushData {
+  id: string;
+  repo: string;
+  branch: string;
+  commitFrom: string;
+  commitTo: string;
+  commitData: CommitData[];
+  diff: {
+    content: string;
+  };
+  canceled?: boolean;
+  rejected?: boolean;
+  authorised?: boolean;
+  attestation?: AttestationData;
+  autoApproved?: boolean;
+  timestamp: string | Date;
+}
+
+export interface Route {
+  path: string;
+  layout: string;
+  name: string;
+  rtlName?: string;
+  component: React.ComponentType<any>;
+  icon?: string | React.ComponentType<any>;
+  visible?: boolean;
+}

src/ui/assets/jss/material-dashboard-react/layouts/adminStyle.ts

@@ -8,19 +8,10 @@ import Hidden from '@material-ui/core/Hidden';
 import Menu from '@material-ui/icons/Menu';
 import DashboardNavbarLinks from './DashboardNavbarLinks';
 import styles from '../../assets/jss/material-dashboard-react/components/headerStyle';
+import { Route } from '../../../types/models';
 
 const useStyles = makeStyles(styles as any);
 
-interface Route {
-  component: any;
-  icon: any;
-  layout: string;
-  name: string;
-  rtlName?: string;
-  path: string;
-  visible: boolean;
-}
-
 interface HeaderProps {
   color?: 'primary' | 'info' | 'success' | 'warning' | 'danger';
   rtlActive?: boolean;

src/ui/components/Navbars/Navbar.tsx

@@ -9,19 +9,10 @@ import ListItem from '@material-ui/core/ListItem';
 import ListItemText from '@material-ui/core/ListItemText';
 import Icon from '@material-ui/core/Icon';
 import styles from '../../assets/jss/material-dashboard-react/components/sidebarStyle';
+import { Route } from '../../../types/models';
 
 const useStyles = makeStyles(styles as any);
 
-interface Route {
-  path: string;
-  layout: string;
-  name: string;
-  icon: string | React.ComponentType;
-  visible?: boolean;
-  rtlName?: string;
-  component: React.ComponentType;
-}
-
 interface SidebarProps {
   color: 'purple' | 'blue' | 'green' | 'orange' | 'red';
   logo: string;

src/ui/components/Sidebar/Sidebar.tsx

@@ -11,12 +11,7 @@ import styles from '../assets/jss/material-dashboard-react/layouts/dashboardStyl
 import logo from '../assets/img/git-proxy.png';
 import { UserContext } from '../../context';
 import { getUser } from '../services/user';
-
-interface RouteType {
-  layout: string;
-  path: string;
-  component: React.ComponentType<any>;
-}
+import { Route as RouteType } from '../../types/models';
 
 interface DashboardProps {
   [key: string]: any;

src/ui/layouts/Dashboard.tsx

@@ -15,23 +15,7 @@ import { getPushes } from '../../../services/git-push';
 import { KeyboardArrowRight } from '@material-ui/icons';
 import Search from '../../../components/Search/Search';
 import Pagination from '../../../components/Pagination/Pagination';
-
-interface CommitData {
-  commitTs?: number;
-  commitTimestamp?: number;
-  message: string;
-  committer: string;
-  author: string;
-  authorEmail?: string;
-}
-
-interface PushData {
-  id: string;
-  repo: string;
-  branch: string;
-  commitTo: string;
-  commitData: CommitData[];
-}
+import { PushData } from '../../../../types/models';
 
 interface PushesTableProps {
   [key: string]: any;

src/ui/views/OpenPushRequests/components/PushesTable.tsx

@@ -22,36 +22,7 @@ import { getPush, authorisePush, rejectPush, cancelPush } from '../../services/g
 import { CheckCircle, Visibility, Cancel, Block } from '@material-ui/icons';
 import Snackbar from '@material-ui/core/Snackbar';
 import Tooltip from '@material-ui/core/Tooltip';
-import { CommitData } from '../../../types/models';
-
-interface Reviewer {
-  username: string;
-  gitAccount: string;
-}
-
-interface AttestationData {
-  reviewer: Reviewer;
-  timestamp: string | Date;
-  questions: Array<{ label: string; checked: boolean }>;
-}
-
-interface PushData {
-  id: string;
-  repo: string;
-  branch: string;
-  commitFrom: string;
-  commitTo: string;
-  commitData: CommitData[];
-  diff: {
-    content: string;
-  };
-  canceled?: boolean;
-  rejected?: boolean;
-  authorised?: boolean;
-  attestation?: AttestationData;
-  autoApproved?: boolean;
-  timestamp: string | Date;
-}
+import { PushData } from '../../../types/models';
 
 const Dashboard: React.FC = () => {
   const { id } = useParams<{ id: string }>();

src/ui/views/PushDetails/PushDetails.tsx

@@ -0,0 +1,21 @@
+interface Question {
+  label: string;
+  checked: boolean;
+}
+
+interface Reviewer {
+  username: string;
+  gitAccount: string;
+}
+
+interface AttestationData {
+  reviewer: Reviewer;
+  timestamp: string | Date;
+  questions: Question[];
+}
+
+interface AttestationViewProps {
+  attestation: boolean;
+  setAttestation: (value: boolean) => void;
+  data: AttestationData;
+}

src/ui/views/PushDetails/attestation.types.ts

@@ -12,28 +12,6 @@ import { withStyles } from '@material-ui/core/styles';
 import { green } from '@material-ui/core/colors';
 import { getURLShortener } from '../../../services/config';
 
-interface Question {
-  label: string;
-  checked: boolean;
-}
-
-interface Reviewer {
-  username: string;
-  gitAccount: string;
-}
-
-interface AttestationData {
-  reviewer: Reviewer;
-  timestamp: string | Date;
-  questions: Question[];
-}
-
-interface AttestationViewProps {
-  attestation: boolean;
-  setAttestation: (value: boolean) => void;
-  data: AttestationData;
-}
-
 const StyledFormControlLabel = withStyles({
   root: {
     color: 'white',

src/ui/views/PushDetails/components/AttestationView.tsx

@@ -8,18 +8,6 @@ import moment from 'moment';
 import CodeActionButton from '../../../components/CustomButtons/CodeActionButton';
 import { languageColors } from '../../../../constants/languageColors';
 
-interface RepositoriesProps {
-  data: {
-    project: string;
-    name: string;
-    proxyURL: string;
-    users?: {
-      canPush?: string[];
-      canAuthorise?: string[];
-    };
-  };
-}
-
 interface GitHubRepository {
   description?: string;
   language?: string;