Make VcsData null check compatible.

railsware · Jun 2, 2016 · 0a91182 · 0a91182
1 parent 7fce4a8
commit 0a91182
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 20 deletions.
diff --git a/src/plugins/GitWatcher.ts b/src/plugins/GitWatcher.ts
@@ -60,7 +60,6 @@ class GitWatcher extends EventEmitter {
             const status: VcsStatus = changes.length ? "dirty" : "clean";
 
             const data: VcsData = {
-                isRepository: true,
                 branch: head,
                 status: status,
             };

diff --git a/src/views/2_SessionComponent.tsx b/src/views/2_SessionComponent.tsx
@@ -14,7 +14,7 @@ interface Props {
 }
 
 interface State {
-    vcsData: VcsData;
+    vcsData: VcsData | undefined;
 }
 
 export class SessionComponent extends React.Component<Props, State> {
@@ -24,7 +24,7 @@ export class SessionComponent extends React.Component<Props, State> {
         super(props);
 
         this.state = {
-            vcsData: {isRepository: false},
+            vcsData: undefined,
         };
     }
 

diff --git a/src/views/StatusLineComponent.tsx b/src/views/StatusLineComponent.tsx
@@ -9,23 +9,22 @@ const CurrentDirectory = ({currentWorkingDirectory}: { currentWorkingDirectory:
         {currentWorkingDirectory}
     </div>;
 
-const VcsDataComponent = ({data}: { data: VcsData }) => {
-    if (!data.isRepository) {
-        /* tslint:disable:no-null-keyword */
-        return null;
-    }
-
-    return (
-        <div style={css.statusLine.vcsData}>
-            <div style={css.statusLine.status(data.status)}>
-                <span style={css.statusLine.icon} dangerouslySetInnerHTML={{__html: fontAwesome.codeFork}}/>
-                {data.branch}
+const VcsDataComponent = ({data}: { data: VcsData | undefined }) => {
+    if (data) {
+        return (
+            <div style={css.statusLine.vcsData}>
+                <div style={css.statusLine.status(data.status)}>
+                    <span style={css.statusLine.icon} dangerouslySetInnerHTML={{__html: fontAwesome.codeFork}}/>
+                    {data.branch}
+                </div>
             </div>
-        </div>
-    );
+        );
+    } else {
+        return <div></div>;
+    }
 };
 
-export const StatusLineComponent = ({currentWorkingDirectory, vcsData}: { currentWorkingDirectory: string; vcsData: VcsData }) =>
+export const StatusLineComponent = ({currentWorkingDirectory, vcsData}: { currentWorkingDirectory: string; vcsData: VcsData | undefined }) =>
     <div style={css.statusLine.itself}>
         <CurrentDirectory currentWorkingDirectory={currentWorkingDirectory}/>
         <VcsDataComponent data={vcsData}/>

diff --git a/typings/Interfaces.d.ts b/typings/Interfaces.d.ts
@@ -25,9 +25,8 @@ interface PartialRowColumn {
 type VcsStatus = "dirty" | "clean";
 
 interface VcsData {
-    isRepository: boolean;
-    branch?: string;
-    status?: VcsStatus;
+    branch: string;
+    status: VcsStatus;
 }
 
 interface Margins {