From 36018471e97d6d5b01d8404f451916f322e85ff6 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Wed, 18 Oct 2023 09:30:09 +0000
Subject: [PATCH] CE-2127: Revise texts
---
src/components/IOC/IOCLiveStatus/IOCLiveStatus.js | 2 +-
src/components/IOC/IOCManage/IOCManage.js | 6 +++---
src/components/common/Loki/LokiPanel.js | 2 +-
src/views/help/HelpView.js | 12 ++++++------
src/views/host/HostDetailsView.js | 2 +-
src/views/records/RecordDetailsView.js | 2 ++
6 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/components/IOC/IOCLiveStatus/IOCLiveStatus.js b/src/components/IOC/IOCLiveStatus/IOCLiveStatus.js
index 848b1eb8..fd133eaf 100644
--- a/src/components/IOC/IOCLiveStatus/IOCLiveStatus.js
+++ b/src/components/IOC/IOCLiveStatus/IOCLiveStatus.js
@@ -91,7 +91,7 @@ export function IOCLiveStatus({ ioc }) {
renderNoAccess={() => <></>}
>
<SimpleAccordion
- summary="ProcServLog info"
+ summary="IOC log stream"
expanded={deserialize(state.procserv_log_open)}
onChange={(event, expanded) =>
setState({ procserv_log_open: serialize(expanded) })
diff --git a/src/components/IOC/IOCManage/IOCManage.js b/src/components/IOC/IOCManage/IOCManage.js
index 8e3835ff..ed29204d 100644
--- a/src/components/IOC/IOCManage/IOCManage.js
+++ b/src/components/IOC/IOCManage/IOCManage.js
@@ -88,7 +88,7 @@ export function IOCManage({
const showControls = deploymentStatus.wasSuccessful();
let subset = {
- "IOC name": (
+ "Naming service record": (
<Typography>
<MuiLink
href={`${window.NAMING_ADDRESS}/devices.xhtml?i=2&deviceName=${ioc.namingName}`}
@@ -100,7 +100,7 @@ export function IOCManage({
</MuiLink>
</Typography>
),
- git: (
+ Repository: (
<Typography>
<MuiLink
href={git}
@@ -127,7 +127,7 @@ export function IOCManage({
}}
/>
) : (
- "Can't be controlled, because IOC is not (yet) deployed succesfully"
+ "IOC not yet deployed"
);
}
diff --git a/src/components/common/Loki/LokiPanel.js b/src/components/common/Loki/LokiPanel.js
index 8ddc073e..95dde124 100644
--- a/src/components/common/Loki/LokiPanel.js
+++ b/src/components/common/Loki/LokiPanel.js
@@ -220,7 +220,7 @@ export function LokiPanel({ host, iocName, isSyslog, isDeployed }) {
)}
dataReady={dataReady}
extraClass={isDeployed ? classes.deployed : classes.undeployed}
- title={isSyslog ? "Syslog" : "ProcServ log"}
+ title={isSyslog ? "Host log stream" : "IOC log stream"}
dialogHeader={header}
loading={periodChange}
/>
diff --git a/src/views/help/HelpView.js b/src/views/help/HelpView.js
index e9d37441..ab89777f 100644
--- a/src/views/help/HelpView.js
+++ b/src/views/help/HelpView.js
@@ -14,16 +14,16 @@ export function HelpView() {
summary={
<Stack gap={1.5}>
<Typography>
- This is the deployment and monitoring parts of the IOC toolchain
- in the Controls Ecosystem; CE Deploy & Monitor.{" "}
+ CE Deploy & Monitor is the deployment and monitoring parts of the
+ IOC toolchain in the Controls Ecosystem.{" "}
</Typography>
<Typography>
It is a tool that manages IOCs on host machines, using Ansible to
perform the necessary configuration management. This tool will set
- up IOC-hosts and deploy IOC(s) in a consistent manner, and will
- configure all necessary services towards this purpose. The tool
- also integrates with various other systems to enable monitoring of
- IOCs and hosts, and enables some limited remote execution
+ up IOC hosts and deploy IOCs in a consistent manner, and will
+ configure all necessary services needed for this purpose. It also
+ integrates with various other systems to enable monitoring of IOCs
+ and hosts, and further enables some limited remote execution
features.
</Typography>
<Typography fontStyle="italic">
diff --git a/src/views/host/HostDetailsView.js b/src/views/host/HostDetailsView.js
index f7e78f6e..19ccd06a 100644
--- a/src/views/host/HostDetailsView.js
+++ b/src/views/host/HostDetailsView.js
@@ -242,7 +242,7 @@ export function HostDetailsView({ id, host }) {
renderNoAccess={() => <></>}
>
<SimpleAccordion
- summary="Syslog info"
+ summary="Host log stream"
expanded={deserialize(urlState.syslog_open)}
onChange={(event, expanded) =>
setUrlState({ syslog_open: serialize(expanded) })
diff --git a/src/views/records/RecordDetailsView.js b/src/views/records/RecordDetailsView.js
index b625d00c..b21c8e05 100644
--- a/src/views/records/RecordDetailsView.js
+++ b/src/views/records/RecordDetailsView.js
@@ -128,6 +128,8 @@ export function RecordDetailsView() {
subset.Description = value;
} else if (key.toLowerCase().includes("alias")) {
subset["Record type"] = value;
+ } else if (key.toLowerCase() === "iocversion") {
+ subset["IOC Revision"] = value;
} else if (key.toLowerCase() !== "iocid") {
subset[key.replaceAll("_", " ")] = value;
}
--
GitLab