Add path and commit summary to diff (#919)

Change-Id: diff-path-summary
josh-project · Aug 30, 2022 · f09e50a · f09e50a
1 parent c249e59
commit f09e50a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/josh-ui/src/DiffViewer.tsx b/josh-ui/src/DiffViewer.tsx
@@ -16,6 +16,7 @@ export type DiffViewerProps = {
 type State = {
     content_a?: string
     content_b?: string
+    summary: string
     client: GraphQLClient
 }
 
@@ -37,6 +38,7 @@ export class DiffViewer extends React.Component<DiffViewerProps, State> {
     state = {
         content_a: undefined,
         content_b: undefined,
+        summary: "",
         client: new GraphQLClient(`${getServer()}/~/graphql/${this.props.repo}`, {
             mode: 'cors',
             errorPolicy: 'all'
@@ -64,26 +66,31 @@ export class DiffViewer extends React.Component<DiffViewerProps, State> {
 
             this.setState({
                 content_a: content_a,
-                content_b: content_b
+                content_b: content_b,
+                summary: data.summary,
             })
         })
     }
 
     render() {
         if (this.state.content_a !== undefined 
         &&  this.state.content_b !== undefined) {
-            return <DiffEditor
-                modified={this.state.content_b}
-                original={this.state.content_a}
-                language={mapLanguage(this.props.path)}
-                height='80vh'
-                theme='vs-dark'
-                options={{
-                    readOnly: true,
-                    domReadOnly: true,
-                    cursorBlinking: 'solid',
-                }}
-            />
+            return <div>
+                <div>{this.state.summary}</div>
+                <div>{this.props.path}</div>
+                <DiffEditor
+                    modified={this.state.content_b}
+                    original={this.state.content_a}
+                    language={mapLanguage(this.props.path)}
+                    height='80vh'
+                    theme='vs-dark'
+                    options={{
+                        readOnly: true,
+                        domReadOnly: true,
+                        cursorBlinking: 'solid',
+                    }}
+                />
+            </div>
         } else
         {
             return <div>Loading...</div>

diff --git a/josh-ui/src/Navigation.tsx b/josh-ui/src/Navigation.tsx
@@ -44,6 +44,7 @@ query($rev: String!, $filter: String!, $path: String!) {
 export const QUERY_FILE_DIFF = gql`
 query($rev: String!, $filter: String!, $path: String!) {
   rev(at:$rev, filter:$filter) {
+    summary
     history(limit: 2) {
       file(path:$path) {
         text