Merge pull request #651 from keymanapp/auto/A19S28-merge-master-into-staging

auto: A19S28 merge master into staging

Author: mcdurdin

build.sh

@@ -41,10 +41,16 @@ builder_describe \
 builder_parse "$@"
 
 function build_docker_containers() {
+  NEWVERSION="$(git rev-parse HEAD)"
+  echo "Writing version '$NEWVERSION' to version.ts"
+  echo "export const buildVersion = '$NEWVERSION';" > shared/version.ts
+
   build_docker_container $THIS_IMAGE_NAME $THIS_CONTAINER_NAME $BUILDER_CONFIGURATION server.Dockerfile
   if builder_is_debug_build; then
     build_docker_container $PUBLIC_IMAGE_NAME $PUBLIC_CONTAINER_NAME $BUILDER_CONFIGURATION public.Dockerfile
   fi
+
+  git checkout shared/version.ts
 }
 
 function start_docker_containers() {

public/package-lock.json

@@ -3,6 +3,7 @@ import { platforms, PlatformSpec } from '../../../../shared/platforms';
 import { PopupCoordinatorService } from '../popup-coordinator.service';
 import { PopupComponent } from '../popup/popup.component';
 import { VisibilityService } from '../visibility/visibility.service';
+import { Status } from '../status/status.interface';
 
 @Component({
     selector: 'app-agent-detail',
@@ -12,7 +13,7 @@ import { VisibilityService } from '../visibility/visibility.service';
 })
 export class AgentDetailComponent extends PopupComponent implements OnInit {
   @Input() agent: any;
-  @Input() status: any;
+  @Input() status: Status;
 
   platform: PlatformSpec;
   buildType: string;
@@ -45,7 +46,7 @@ export class AgentDetailComponent extends PopupComponent implements OnInit {
       }
       if(this.agent.build.branchName?.match(/^\d+$/)) {
         const prNumber = parseInt(this.agent.build.branchName, 10);
-        this.pullRequest = this.status.github?.data?.repository?.pullRequests?.edges?.find(pr => pr.node?.number == prNumber)?.node;
+        this.pullRequest = this.status.keymanRepo?.pullRequests?.edges?.find(pr => pr.node?.number == prNumber)?.node;
         if(!this.pullRequest) {
           this.pullRequest = {number: prNumber, title: '<unknown pull request>'};
         }

public/src/app/agent-detail/agent-detail.component.ts

@@ -53,7 +53,7 @@ export class BuildQueueComponent extends PopupComponent implements OnInit {
 
   getPullRequestTitle(build) {
     const prNumber = parseInt(build.branchName, 10);
-    const pullRequest = this.status.github?.data?.repository?.pullRequests?.edges?.find(pr => pr.node?.number == prNumber)?.node;
+    const pullRequest = this.status.keymanRepo?.pullRequests?.edges?.find(pr => pr.node?.number == prNumber)?.node;
     return pullRequest ? pullRequest.title : '<unknown pull request>';
   }
 

public/src/app/build-queue/build-queue.component.ts

@@ -15,6 +15,8 @@ interface OtherSites {
 export class DataModel {
   status: Status = EMPTY_STATUS;
 
+  serverBuildVersion: string = '';
+
   serviceState: {service: ServiceIdentifier, state: ServiceState, message?: string}[];
 
   platforms: PlatformSpec[] = JSON.parse(JSON.stringify(platforms)); // makes a copy of the constant platform data for this component
@@ -86,6 +88,7 @@ export class DataModel {
         break;
       case ServiceIdentifier.GitHub:
         this.status.github = data.github;
+        this.status.keymanRepo = this.status.github?.data.organization.repositories.nodes.find(e=>e.name=='keyman');
         this.keyboardPRs = this.status.github?.data.organization.repositories.nodes.find(e=>e.name=='keyboards')?.pullRequests.edges;
         this.lexicalModelPRs = this.status.github?.data.organization.repositories.nodes.find(e=>e.name=='lexical-models')?.pullRequests.edges;
         this.transformPlatformStatusData();
@@ -181,7 +184,7 @@ export class DataModel {
     for(let platform of this.platforms) {
       platform.pulls = [];
       platform.pullsByEmoji = {};
-      for(let pull of this.status.github.data.repository.pullRequests.edges) {
+      for(let pull of this.status.keymanRepo.pullRequests.edges) {
         pull.node.checkSummary = pullChecks(pull);
         let labels = pull.node.labels.edges;
         let status = pull.node.commits.edges[0].node.commit.status;
@@ -237,8 +240,8 @@ export class DataModel {
       })
     };
 
-    if(this.status.github && this.status.github.data) {
-      this.status.github.data.repository.pullRequests.edges.forEach(item => {
+    if(this.status.keymanRepo) {
+      this.status.keymanRepo.pullRequests.edges.forEach(item => {
         removeDuplicates(item.node.timelineItems);
      });
     }
@@ -360,7 +363,7 @@ export class DataModel {
 
     // TODO: split search against future and current milestones (future milestone shows only count; current milestone shows more detail)
     // For each platform, fill in the milestone counts
-    this.status.github.data.repository.issuesByLabelAndMilestone.edges.forEach(label => {
+    this.status.github.data.repositoryRefsLabelsMilestones.issueLabels.edges.forEach(label => {
       let platform = this.getPlatform(label.node.name.substring(0,label.node.name.length-1));
       if(!platform) return;
       platform.totalIssueCount = label.node.openIssues.totalCount;
@@ -453,8 +456,8 @@ export class DataModel {
 
   extractUnlabeledPulls() {
     this.unlabeledPulls = [];
-    for(let q in this.status.github.data.repository.pullRequests.edges) {
-      let pull = this.status.github.data.repository.pullRequests.edges[q];
+    for(let q in this.status.keymanRepo.pullRequests.edges) {
+      let pull = this.status.keymanRepo.pullRequests.edges[q];
       if(!this.labeledPulls.includes(pull)) {
         this.unlabeledPulls.push({pull:pull});
       }
@@ -501,8 +504,8 @@ export class DataModel {
     this.pullsByStatus.waitingReview = [];
     this.pullsByStatus.waitingTest = [];
     this.pullsByStatus.waitingResponse = [];
-    for(let q in this.status.github.data.repository.pullRequests.edges) {
-      let pull = this.status.github.data.repository.pullRequests.edges[q];
+    for(let q in this.status.keymanRepo.pullRequests.edges) {
+      let pull = this.status.keymanRepo.pullRequests.edges[q];
       let emoji = pullEmoji(pull) || "other";
       if(!this.pullsByProject[emoji]) this.pullsByProject[emoji] = [];
 
@@ -617,7 +620,7 @@ export class DataModel {
     }
 
     while(pull && !pull.node.baseRefName.match(ultimateBaseRef)) {
-      pull = this.status.github.data.repository.pullRequests.edges.find(e => e.node.headRefName == pull.node.baseRefName);
+      pull = this.status.keymanRepo.pullRequests.edges.find(e => e.node.headRefName == pull.node.baseRefName);
     }
 
     input.node.ultimateBaseRefName = pull ? pull.node.baseRefName : 'unknown';