Merge pull request #718 from Drulikar/deployment_tm_status_change

Deployment tab will now display whether TMs were added or updated

Author: Cyberboss

src/components/utils/DeploymentViewer.tsx

@@ -9,7 +9,11 @@ import { Badge, OverlayTrigger, Table, Tooltip } from "react-bootstrap";
 import { FormattedMessage } from "react-intl";
 import { lt as SemverLessThan } from "semver";
 
-import { CompileJobResponse, DreamDaemonSecurity } from "../../ApiClient/generatedcode/generated";
+import {
+    CompileJobResponse,
+    DreamDaemonSecurity,
+    TestMerge
+} from "../../ApiClient/generatedcode/generated";
 import { InstanceEditContext } from "../../contexts/InstanceEditContext";
 import Engine from "../views/Instance/Edit/Engine";
 import { DebugJsonViewer } from "./JsonViewer";
@@ -31,6 +35,7 @@ export interface CompileJobsPaging {
 export interface DeploymentsData {
     viewDataType: ViewDataType;
     compileJobs?: CompileJobResponse[];
+    prevCompileJob?: CompileJobResponse | null;
     paging: CompileJobsPaging;
 }
 
@@ -198,12 +203,19 @@ class DeploymentViewer extends React.Component<IProps, IState> {
             </React.Fragment>
         );
     }
+
     private renderDeployments(viewData: DeploymentsData): React.ReactNode {
         return (
             <React.Fragment>
                 {this.renderTable(
                     <React.Fragment>
-                        {viewData.compileJobs!.map(compileJob => this.renderCompileJob(compileJob))}
+                        {viewData.compileJobs!.map((compileJob, i, jobs) => {
+                            if (i < jobs.length - 1) {
+                                return this.renderCompileJob(compileJob, jobs[i + 1]);
+                            } else {
+                                return this.renderCompileJob(compileJob, viewData.prevCompileJob);
+                            }
+                        })}
                     </React.Fragment>
                 )}
                 <PageHelper
@@ -216,7 +228,32 @@ class DeploymentViewer extends React.Component<IProps, IState> {
         );
     }
 
-    private renderCompileJob(compileJob: CompileJobResponse) {
+    private getTestMergeDiffStatus(
+        testMerge: TestMerge,
+        previousCompileJob?: CompileJobResponse | null
+    ) {
+        const oldTestMerges = previousCompileJob?.revisionInformation?.activeTestMerges;
+        if (!oldTestMerges || oldTestMerges.length == 0) {
+            return <FormattedMessage id="view.utils.deployment_viewer.table.pr.tm_diff.tm_added" />;
+        }
+        for (let index = 0; index < oldTestMerges.length; index++) {
+            const oldTestMerge = oldTestMerges[index];
+            if (oldTestMerge.number == testMerge.number) {
+                if (oldTestMerge.targetCommitSha != testMerge.targetCommitSha) {
+                    return (
+                        <FormattedMessage id="view.utils.deployment_viewer.table.pr.tm_diff.tm_updated" />
+                    );
+                }
+                return "";
+            }
+        }
+        return <FormattedMessage id="view.utils.deployment_viewer.table.pr.tm_diff.tm_added" />;
+    }
+
+    private renderCompileJob(
+        compileJob: CompileJobResponse,
+        previousCompileJob?: CompileJobResponse | null
+    ) {
         const engineVersion = Engine.friendlyVersion(compileJob.engineVersion);
 
         // we use en-GB so we get the fucking SANE DD/MM/YYYY
@@ -354,6 +391,9 @@ class DeploymentViewer extends React.Component<IProps, IState> {
                                     <th>
                                         <FormattedMessage id="view.utils.deployment_viewer.table.pr.number" />
                                     </th>
+                                    <th>
+                                        <FormattedMessage id="view.utils.deployment_viewer.table.pr.tm_diff" />
+                                    </th>
                                     <th>
                                         <FormattedMessage id="view.utils.deployment_viewer.table.pr.title" />
                                     </th>
@@ -378,6 +418,12 @@ class DeploymentViewer extends React.Component<IProps, IState> {
                                                 <td>
                                                     <a href={testMerge.url}>#{testMerge.number}</a>
                                                 </td>
+                                                <td>
+                                                    {this.getTestMergeDiffStatus(
+                                                        testMerge,
+                                                        previousCompileJob
+                                                    )}
+                                                </td>
                                                 <td>
                                                     <a href={testMerge.url}>
                                                         {testMerge.titleAtMerge}

src/components/views/Instance/Edit/Deployment.tsx

@@ -31,6 +31,7 @@ export function Deployment(): JSX.Element {
     const [isLoading, setIsLoading] = useState(true);
     const [deployInfo, setDeployInfo] = useState<DreamMakerResponse | null>(null);
     const [compileJobs, setCompileJobs] = useState<CompileJobResponse[] | null>(null);
+    const [prevCompileJob, setPrevCompileJob] = useState<CompileJobResponse | null>(null);
     const [compileJobsPage, setCompileJobsPage] = useState<number>(1);
     const [compileJobsTotalPages, setCompileJobsTotalPages] = useState<number>(0);
 
@@ -82,6 +83,30 @@ export function Deployment(): JSX.Element {
             setCompileJobsTotalPages(response.payload.totalPages);
             setCompileJobsPage(page);
             setCompileJobs(response.payload.content);
+
+            // also grab the job on the next page if possible
+            if (
+                response.payload.content.length == compileJobsPageSize &&
+                response.payload.totalPages > page
+            ) {
+                const extraResponse = await DreamMakerClient.listCompileJobs(
+                    instanceEditContext.instance.id,
+                    {
+                        page: compileJobsPageSize * page + 1,
+                        pageSize: 1
+                    }
+                );
+                if (
+                    extraResponse.code === StatusCode.OK &&
+                    extraResponse.payload.content.length > 0
+                ) {
+                    setPrevCompileJob(extraResponse.payload.content[0]);
+                } else {
+                    setPrevCompileJob(null);
+                }
+            } else {
+                setPrevCompileJob(null);
+            }
         } else {
             addError(errorState, response.error);
         }
@@ -189,6 +214,7 @@ export function Deployment(): JSX.Element {
         deploymentViewData = {
             viewDataType: ViewDataType.CompileJobs,
             compileJobs,
+            prevCompileJob,
             paging
         };
     }

src/translations/locales/en.json

@@ -215,6 +215,9 @@
     "view.utils.deployment_viewer.table.started_by": "Started By",
     "view.utils.deployment_viewer.table.project": "Project Name",
     "view.utils.deployment_viewer.table.pr.number": "Test Merge #",
+    "view.utils.deployment_viewer.table.pr.tm_diff": "Change",
+    "view.utils.deployment_viewer.table.pr.tm_diff.tm_added": "Added",
+    "view.utils.deployment_viewer.table.pr.tm_diff.tm_updated": "Updated",
     "view.utils.deployment_viewer.table.pr.title": "Title",
     "view.utils.deployment_viewer.table.pr.merged_by": "Merged By",
     "view.utils.deployment_viewer.table.pr.merged_at": "Merged At",