From 5eae4ffeb4aa63d999d7d9c8b1a6af136b56811f Mon Sep 17 00:00:00 2001 From: Drew Ansbacher Date: Mon, 18 Oct 2021 10:55:38 -0600 Subject: [PATCH] git hash in build script (#691) Co-authored-by: Drew Ansbacher --- ui/config-sample.json | 1 + .../server-routes/server-specs/server-specs.page.html | 7 +++++++ .../pages/server-routes/server-specs/server-specs.page.ts | 2 ++ ui/src/app/services/config.service.ts | 4 +++- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ui/config-sample.json b/ui/config-sample.json index 65a58f496..a955755f3 100644 --- a/ui/config-sample.json +++ b/ui/config-sample.json @@ -1,4 +1,5 @@ { + "gitHash": "", "patchDb": { "poll": { "cooldown": 10000 diff --git a/ui/src/app/pages/server-routes/server-specs/server-specs.page.html b/ui/src/app/pages/server-routes/server-specs/server-specs.page.html index 76de2122a..e26cb7bc5 100644 --- a/ui/src/app/pages/server-routes/server-specs/server-specs.page.html +++ b/ui/src/app/pages/server-routes/server-specs/server-specs.page.html @@ -19,6 +19,13 @@ + + +

Git Hash

+

{{ config.gitHash }}

+
+
+ Addresses diff --git a/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts b/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts index d7acd3020..f41b01660 100644 --- a/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts +++ b/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts @@ -2,6 +2,7 @@ import { Component, ViewChild } from '@angular/core' import { IonContent, ToastController } from '@ionic/angular' import { copyToClipboard } from 'src/app/util/web.util' import { PatchDbService } from 'src/app/services/patch-db/patch-db.service' +import { ConfigService } from 'src/app/services/config.service' @Component({ selector: 'server-specs', @@ -14,6 +15,7 @@ export class ServerSpecsPage { constructor ( private readonly toastCtrl: ToastController, public readonly patch: PatchDbService, + public readonly config: ConfigService, ) { } ngAfterViewInit () { diff --git a/ui/src/app/services/config.service.ts b/ui/src/app/services/config.service.ts index 0efb82884..eb0f32747 100644 --- a/ui/src/app/services/config.service.ts +++ b/ui/src/app/services/config.service.ts @@ -1,9 +1,10 @@ import { Injectable } from '@angular/core' import { InterfaceDef, PackageDataEntry, PackageMainStatus, PackageState } from './patch-db/data-model' -const { patchDb, api, mocks } = require('../../../config.json') as UiConfig +const { gitHash, patchDb, api, mocks } = require('../../../config.json') as UiConfig type UiConfig = { + gitHash: string patchDb: { poll: { cooldown: number /* in ms */ @@ -30,6 +31,7 @@ export class ConfigService { origin = removePort(removeProtocol(window.origin)) version = require('../../../package.json').version + gitHash = gitHash patchDb = patchDb api = api mocks = mocks