From 184113178e7b7b60d6bb8a77ed1f68ba51602d05 Mon Sep 17 00:00:00 2001 From: james-strauss-uwa Date: Wed, 15 May 2024 11:58:26 +0800 Subject: [PATCH] Changed from eagleVersion to generatorVersion, eagleCommitHash to generatorCommitHash, added generatorVersion to FileInfo(modelData) --- src/FileInfo.ts | 71 ++++++++++++++++++++++++++++++--------------- src/GraphUpdater.ts | 2 +- 2 files changed, 48 insertions(+), 25 deletions(-) diff --git a/src/FileInfo.ts b/src/FileInfo.ts index acc4927d4..9345dc31a 100644 --- a/src/FileInfo.ts +++ b/src/FileInfo.ts @@ -17,8 +17,9 @@ export class FileInfo { private _repositoryBranch : ko.Observable; private _repositoryName : ko.Observable; private _modified : ko.Observable; - private _eagleVersion : ko.Observable; - private _eagleCommitHash : ko.Observable; + private _generatorVersion : ko.Observable; + private _generatorCommitHash : ko.Observable; + private _generatorName : ko.Observable; private _schemaVersion : ko.Observable; private _readonly : ko.Observable; private _builtIn : ko.Observable; @@ -45,8 +46,9 @@ export class FileInfo { this._repositoryBranch = ko.observable(""); this._repositoryName = ko.observable(""); this._modified = ko.observable(false); - this._eagleVersion = ko.observable(""); - this._eagleCommitHash = ko.observable(""); + this._generatorVersion = ko.observable(""); + this._generatorCommitHash = ko.observable(""); + this._generatorName = ko.observable(""); this._schemaVersion = ko.observable(Daliuge.SchemaVersion.Unknown); this._readonly = ko.observable(true); this._builtIn = ko.observable(false); // NOTE: not written to/read from JSON @@ -135,20 +137,28 @@ export class FileInfo { this._modified(modified); } - get eagleVersion() : string{ - return this._eagleVersion(); + get generatorVersion() : string{ + return this._generatorVersion(); } - set eagleVersion(version : string){ - this._eagleVersion(version); + set generatorVersion(version : string){ + this._generatorVersion(version); } - get eagleCommitHash() : string{ - return this._eagleCommitHash(); + get generatorCommitHash() : string{ + return this._generatorCommitHash(); } - set eagleCommitHash(hash : string){ - this._eagleCommitHash(hash); + set generatorCommitHash(hash : string){ + this._generatorCommitHash(hash); + } + + get generatorName() : string{ + return this._generatorName(); + } + + set generatorName(hash : string){ + this._generatorName(hash); } get schemaVersion(): Daliuge.SchemaVersion{ @@ -250,8 +260,9 @@ export class FileInfo { this._repositoryBranch(""); this._repositoryName(""); this._modified(false); - this._eagleVersion(""); - this._eagleCommitHash(""); + this._generatorVersion(""); + this._generatorCommitHash(""); + this._generatorName(""); this._schemaVersion(Daliuge.SchemaVersion.Unknown); this._readonly(true); this._builtIn(true); @@ -281,8 +292,9 @@ export class FileInfo { result.repositoryBranch = this._repositoryBranch(); result.repositoryName = this._repositoryName(); result.modified = this._modified(); - result.eagleVersion = this._eagleVersion(); - result.eagleCommitHash = this._eagleCommitHash(); + result.generatorVersion = this._generatorVersion(); + result.generatorCommitHash = this._generatorCommitHash(); + result.generatorName = this._generatorName(); result.schemaVersion = this._schemaVersion(); result.readonly = this._readonly(); result.builtIn = this._builtIn(); @@ -325,8 +337,15 @@ export class FileInfo { } updateEagleInfo = () : void => { - this.eagleVersion = (window).version; - this.eagleCommitHash = (window).commit_hash; + this.generatorVersion = (window).version; + this.generatorCommitHash = (window).commit_hash; + this.generatorName = "EAGLE"; + } + + updateGeneratorInfo = (version: string, commitHash: string, name: string) => { + this.generatorVersion = version; + this.generatorCommitHash = commitHash; + this.generatorName = name; } nameAndModifiedIndicator : ko.PureComputed = ko.pureComputed(() => { @@ -373,8 +392,9 @@ export class FileInfo { s += " Repository Name:" + this._repositoryName(); s += " Repository Branch:" + this._repositoryBranch(); s += " Modified:" + this._modified(); - s += " EAGLE Version:" + this._eagleVersion(); - s += " EAGLE Commit Hash:" + this._eagleCommitHash(); + s += " Generator Name:" + this._generatorName(); + s += " Generator Version:" + this._generatorVersion(); + s += " Generator Commit Hash:" + this._generatorCommitHash(); s += " Schema Version:" + this._schemaVersion(); s += " readonly:" + this._readonly(); s += " builtIn:" + this._builtIn(); @@ -406,8 +426,9 @@ export class FileInfo { repoBranch: fileInfo.repositoryBranch, repo: fileInfo.repositoryName, - eagleVersion: fileInfo.eagleVersion, - eagleCommitHash: fileInfo.eagleCommitHash, + generatorVersion: fileInfo.generatorVersion, + generatorCommitHash: fileInfo.generatorCommitHash, + generatorName: fileInfo.generatorName, schemaVersion: fileInfo.schemaVersion, readonly: fileInfo.readonly, @@ -445,8 +466,10 @@ export class FileInfo { result.repositoryBranch = modelData.repoBranch ?? ""; result.repositoryName = modelData.repo ?? ""; - result.eagleVersion = modelData.eagleVersion ?? ""; - result.eagleCommitHash = modelData.eagleCommitHash ?? ""; + // look for deprecated attributes (eagleVersion and eagleCommitHash) too + result.generatorVersion = modelData.generatorVersion ?? modelData.eagleVersion ?? ""; + result.generatorCommitHash = modelData.generatorCommitHash ?? modelData.eagleCommitHash ?? ""; + result.generatorName = modelData.generatorName ?? ""; result.schemaVersion = modelData.schemaVersion ?? ""; result.readonly = modelData.readonly ?? true; diff --git a/src/GraphUpdater.ts b/src/GraphUpdater.ts index 861160c40..12a2ee12e 100644 --- a/src/GraphUpdater.ts +++ b/src/GraphUpdater.ts @@ -188,7 +188,7 @@ export class GraphUpdater { row.numLoadErrors = errorsWarnings.errors.length; // use git-related info within file - row.eagleVersion = lg.fileInfo().eagleVersion; + row.generatorVersion = lg.fileInfo().generatorVersion; row.lastModifiedBy = lg.fileInfo().lastModifiedName; row.repositoryUrl = lg.fileInfo().repositoryUrl; row.commitHash = lg.fileInfo().commitHash;