diff --git a/src/api/SwaggerApi.js b/src/api/SwaggerApi.js index c0f8ac056726d8671a15c50e7d3e273d4b6a6b70..34f695520119a54dd775582cf0b47dfdbbb7bca2 100644 --- a/src/api/SwaggerApi.js +++ b/src/api/SwaggerApi.js @@ -139,7 +139,7 @@ function callAndUnpack(fcn, unpacker = x => x) { export function unpackIOC(ioc) { console.log(ioc); ioc = { ...ioc }; - const { id, description, owner, createdBy, active, configuredToHost, latestVersion, activeDeployment, hasLocalCommits, isDirty } = ioc; + const { id, description, owner, createdBy, active, configuredToHost, latestVersion, activeDeployment, hasLocalCommits, dirty } = ioc; const deployedVersion = activeDeployment ? activeDeployment.version : null; let inflated = null; @@ -158,7 +158,7 @@ export function unpackIOC(ioc) { active: active, status: configuredToHost ? configuredToHost.status : null, hasLocalCommits: hasLocalCommits, - isDirty: isDirty + dirty: dirty }; if (unpackedIOC.latestHost) unpackedIOC.host = unpackedIOC.latestHost.host; diff --git a/src/components/IOC/IOCBadge.js b/src/components/IOC/IOCBadge.js index 9864b85799b7036097e3b32b7e11535042fe0363..436272f8efc1dc10e46ff3e69b7282522881c8c7 100644 --- a/src/components/IOC/IOCBadge.js +++ b/src/components/IOC/IOCBadge.js @@ -27,7 +27,7 @@ function secIcon(isDirty ,hasLocalCommits) { ); } - if ((isDirty === false) || (hasLocalCommits === false)) { + if ((isDirty === null) || (hasLocalCommits === null)) { return( <Tooltip title="Git repository state: unknown"> <img src={YellowGitIcon} alt="Git error" style={{ width:'25%', height:'25%'}}/> @@ -38,6 +38,6 @@ function secIcon(isDirty ,hasLocalCommits) { export function IOCBadge({ ioc }) { return ( - <IconBadge icon={<IOCStatusIcon ioc={ioc} />} secondaryIcon={secIcon(ioc.isDirty ,ioc.hasLocalCommits)} title={ioc.namingName ?? ioc.name} subheader={ioc.host || "---"} /> + <IconBadge icon={<IOCStatusIcon ioc={ioc} />} secondaryIcon={secIcon(ioc.dirty ,ioc.hasLocalCommits)} title={ioc.namingName ?? ioc.name} subheader={ioc.host || "---"} /> ) } \ No newline at end of file