Merge branch 'CE-3136-remove-isdeployed-prop' into 'develop'

CE-3136: Remove isDeployed from LokiPanel, Remove unused LokiContainer, Refactoring

See merge request !541

src/components/IOC/IOCDetails/IOCDetails.js

@@ -33,7 +33,6 @@ const defaultSubset = ({
 }) => ({ name, description, host, active, status, git, version });
 
 export function IOCDetails({ ioc, getSubset = defaultSubset, buttons }) {
-  ioc = { ...ioc };
   const subset = getSubset(ioc);
   const client = useContext(apiContext);
 
@@ -109,7 +108,7 @@ export function IOCDetails({ ioc, getSubset = defaultSubset, buttons }) {
                 component="p"
                 color="textPrimary"
               >
-                {ioc.namingName ?? ioc.name}
+                {ioc.namingName}
               </Typography>
               <Typography
                 noWrap

src/components/IOC/IOCLiveStatus/IOCLiveStatus.js

@@ -24,10 +24,8 @@ export function IOCLiveStatus({ ioc }) {
     { navigateMode: "replace" }
   );
 
-  const liveIOC = { ...ioc };
-  liveIOC.name = ioc.namingName;
-
-  const hostName = liveIOC.activeDeployment?.host?.hostName;
+  const hostName = ioc.activeDeployment?.host?.hostName;
+  const externalIdValid = ioc.activeDeployment?.host?.externalIdValid;
 
   const getSubset = useCallback((ioc) => {
     const iocHasDeployment = new IocActiveDeployment(
@@ -67,14 +65,10 @@ export function IOCLiveStatus({ ioc }) {
     return subset;
   }, []);
 
-  function isIocDeployed(ioc) {
-    return Boolean(ioc.activeDeployment);
-  }
-
   return (
     <>
       <IOCDetails
-        ioc={liveIOC}
+        ioc={ioc}
         getSubset={getSubset}
       />
 
@@ -82,7 +76,7 @@ export function IOCLiveStatus({ ioc }) {
         allowedRoles={["DeploymentToolAdmin", "DeploymentToolIntegrator"]}
         renderNoAccess={() => <></>}
       >
-        {liveIOC.activeDeployment?.host?.externalIdValid && (
+        {externalIdValid && (
           <SimpleAccordion
             summary={
               <Typography
@@ -101,7 +95,6 @@ export function IOCLiveStatus({ ioc }) {
               <LokiPanel
                 hostName={hostName}
                 iocName={ioc.namingName}
-                isDeployed={isIocDeployed(ioc)}
               />
             )}
           </SimpleAccordion>

src/components/common/Loki/LokiContainer.js

-import { Box } from "@mui/material";
-import { LokiPanel } from "./LokiPanel";
-
-export function LokiContainer({ hostName, iocName, isDeployed }) {
-  return (
-    <>
-      {hostName && (
-        <Box sx={{ pt: 2 }}>
-          <LokiPanel
-            hostName={hostName}
-            isSyslog={false}
-            iocName={iocName}
-            isDeployed={isDeployed}
-          />
-        </Box>
-      )}
-    </>
-  );
-}

src/components/common/Loki/LokiPanel.js

@@ -30,11 +30,10 @@ const TIME_RANGE_VALUES = [
  * hostName: name of the host (mandatory) which will be the qery parameter for backend call
  * iocName: name of ioc (optional). Used when querying procServ log
  * isSyslog: boolean, if true -> SysLog will be queried, if false -> procServLog will be queried
- * isDeployed: boolean, if true -> periodic update (backend query) will be enabled, if false -> periodic update will be disabled
  */
 
 const LOG_POLL_INTERVAL = 5000;
-export function LokiPanel({ hostName, iocName, isSyslog, isDeployed }) {
+export function LokiPanel({ hostName, iocName, isSyslog }) {
   const showWarning = useCustomSnackbar();
   const client = useContext(apiContext);
 
@@ -54,7 +53,11 @@ export function LokiPanel({ hostName, iocName, isSyslog, isDeployed }) {
   const [html, setHtml] = useState("");
 
   const preprocessLog = useCallback(
-    (logData, isDeployed, showWarning, timeRange, alertIds, setAlertIds) => {
+    (logData, showWarning, timeRange, alertIds, setAlertIds) => {
+      if (!logData) {
+        return "";
+      }
+
       if (logData?.warning && alertIds?.length === 0) {
         const warningId = showWarning(logData.warning, "warning");
         setAlertIds((alertIds) => [...alertIds, warningId]);
@@ -71,10 +74,6 @@ export function LokiPanel({ hostName, iocName, isSyslog, isDeployed }) {
                     <pre>${logHtml.join("")}</pre>
                   </body>
                 </html>`;
-      } else {
-        if (!(isDeployed === true)) {
-          return "<html><body><pre> NOT DEPLOYED YET! </pre></body></html>";
-        }
       }
 
       return `<html><body><pre> - No messages found for ${TIME_RANGE_VALUES.find((range) => range.value === timeRange).text} period - </pre></body></html>`;
@@ -87,7 +86,6 @@ export function LokiPanel({ hostName, iocName, isSyslog, isDeployed }) {
       isSysLog,
       logData,
       procServLog,
-      isDeployed,
       showWarning,
       timeRange,
       alertIds,
@@ -96,7 +94,6 @@ export function LokiPanel({ hostName, iocName, isSyslog, isDeployed }) {
       if (isSysLog === true) {
         return preprocessLog(
           logData,
-          true,
           showWarning,
           timeRange,
           alertIds,
@@ -106,7 +103,6 @@ export function LokiPanel({ hostName, iocName, isSyslog, isDeployed }) {
 
       return preprocessLog(
         procServLog,
-        isDeployed,
         showWarning,
         timeRange,
         alertIds,
@@ -182,19 +178,9 @@ export function LokiPanel({ hostName, iocName, isSyslog, isDeployed }) {
     if (isSyslog === true) {
       getSysLogData(hostName, timeRange);
     } else {
-      if (isDeployed === true) {
-        getProcServLog(hostName, iocName, timeRange);
-      }
+      getProcServLog(hostName, iocName, timeRange);
     }
-  }, [
-    getSysLogData,
-    getProcServLog,
-    hostName,
-    iocName,
-    isDeployed,
-    isSyslog,
-    timeRange
-  ]);
+  }, [getSysLogData, getProcServLog, hostName, iocName, isSyslog, timeRange]);
 
   const hasLogError = !!sysLogError || !!procServLogError;
   const hasLogData = !!sysLogData || !!procServLog;
@@ -215,7 +201,6 @@ export function LokiPanel({ hostName, iocName, isSyslog, isDeployed }) {
         isSyslog,
         sysLogData,
         procServLog,
-        isDeployed,
         showWarning,
         timeRange,
         alertIds,
@@ -225,7 +210,6 @@ export function LokiPanel({ hostName, iocName, isSyslog, isDeployed }) {
   }, [
     setHtml,
     alertIds,
-    isDeployed,
     isSyslog,
     logsToPreprocess,
     procServLog,

src/components/common/Loki/index.js

-import { LokiContainer } from "./LokiContainer";
 import { LokiPanel } from "./LokiPanel";
 
-export { LokiContainer, LokiPanel };
+export { LokiPanel };

src/views/host/details/HostDetailsView.js

@@ -148,7 +148,6 @@ export function HostDetailsView({ hostId, host, alert }) {
               <LokiPanel
                 hostName={host.name}
                 isSyslog
-                isDeployed
               />
             </SimpleAccordion>
           </AccessControl>