ICSHWI-7718: IOC page fixes

public/config.js

 SERVER_ADDRESS=''
 API_BASE_ENDPOINT='/ccce-api'
-TOKEN_RENEW_INTERVAL=180000
+TOKEN_RENEW_INTERVAL=180000
\ No newline at end of file
+CCDB_ADDRESS='https://ccdb.esss.lu.se'

src/components/IOC/DeployIOC.js

@@ -4,12 +4,12 @@ import { IOCDeployDialog } from "./IOCDeployDialog";
 import { notificationContext } from "../../components/common/notification/Notifications";
 
 // Process component
-export function DeployIOC({ open, setOpen, submitCallback, hook, init={}}) {
+export function DeployIOC({ open, setOpen, submitCallback, hook, hasActiveDeployment, init={}}) {
   const [deployment, action] = hook();
   const {watchDeployment} = useContext(notificationContext);
 
   if (!deployment) {
-    return (<IOCDeployDialog open={open} setOpen={setOpen} submitCallback={action} init={init}/>);
+    return (<IOCDeployDialog open={open} setOpen={setOpen} submitCallback={action} init={init} hasActiveDeployment={hasActiveDeployment}/>);
   }
   else {
     submitCallback(); // This works but throws a warning because I am changing state in the parent while the child is rerendering. Not sure yet how to fix.

src/components/IOC/IOCDeployDialog.js

@@ -10,7 +10,7 @@ const useStyles = makeStyles((theme) => ({
   },
 }));
 
-export function IOCDeployDialog({ open, setOpen, submitCallback, init = {}}) {
+export function IOCDeployDialog({ open, setOpen, submitCallback, hasActiveDeployment, init = {}}) {
   const classes = useStyles();
   const [hosts, getHosts] = useCSEntrySearch();
   const [host, setHost] = useState(null);
@@ -47,7 +47,7 @@ export function IOCDeployDialog({ open, setOpen, submitCallback, init = {}}) {
   return (
     <Dialog open={open} onClose={handleClose}>
       <form onSubmit={onSubmit}>
-        <DialogTitle id="form-dialog-title">Deploy IOC</DialogTitle>
+        <DialogTitle id="form-dialog-title">{ hasActiveDeployment ? "Deploy new revision" : "Deploy" }</DialogTitle>
         <DialogContent>
           <TextField autoComplete="off" className={classes.textField} id="comment" label="Deployment comment" variant="outlined" fullWidth required/>
           <TextField autoComplete="off" className={classes.textField} id="git" label="Git repository" variant="outlined" defaultValue={init.git || ""} fullWidth

src/components/IOC/IOCLiveStatus.js

-import { Button, Snackbar, Typography } from "@material-ui/core";
+import { Button, Typography } from "@material-ui/core";
 import { Alert } from "@material-ui/lab";
 import React from "react";
 import { useGlobalAppBar } from "../navigation/GlobalAppBar/GlobalAppBar";
@@ -35,7 +35,6 @@ export function IOCLiveStatus({ ioc }) {
     })
   };
 
-  const alert = <Alert severity="info">This is the currently deployed version</Alert>;
   const gitAlert = <Alert severity="warning">Git repository state: unknown</Alert>;
 
   const [iocHost] = useHost(liveIOC.activeDeployment?.host.csEntryId);
@@ -49,7 +48,6 @@ export function IOCLiveStatus({ ioc }) {
       <SimpleAccordion summary="ProcServLog info" defaultExpanded>
         {iocHost && <LokiPanel host={iocHost} isSyslog={false} iocName={ioc.latestVersion?.namingName} isDeployed={isIocDeployed(ioc)} />}
       </SimpleAccordion>
-      <Snackbar open autoHideDuration={6000}>{alert}</Snackbar>
     </>
   );
 }

src/components/IOC/IOCManage.js

@@ -40,6 +40,8 @@ export function IOCManage({ ioc, getIOC }) {
       const { sourceUrl: git } = ioc.latestVersion;
       const host = ioc.activeDeployment?.host.host;
       return {
+        "CCDB name": <Typography><MuiLink href={`${window.CCDB_ADDRESS}?name=${ioc.latestVersion.namingName}`} 
+                        target="_blank" rel="noreferrer">{ioc.latestVersion.namingName}</MuiLink></Typography>,
         description,
         // active: (active && (ioc.latestVersion.id == ioc.deployedVersion?.id)), 
         git: <Typography><MuiLink href={git} target="_blank" rel="noreferrer">{git}</MuiLink></Typography>,
@@ -69,15 +71,18 @@ export function IOCManage({ ioc, getIOC }) {
         <IOCDetails ioc={managedIOC} getSubset={getSubset} alert={((managedIOC.dirty === null) || (managedIOC.hasLocalCommits === null)) ? gitAlert : null}
           buttons={
             <>
-              <Button variant="contained" color="secondary" onClick={() => { setDeployDialogOpen(true) }}>Deploy IOC</Button>
+              <Button variant="contained" color="secondary" onClick={() => { setDeployDialogOpen(true) }}>
+                {ioc.activeDeployment ? "Deploy new revision" : "Deploy"}
+              </Button>
               {ioc.activeDeployment ? 
-                <Button variant="contained" color="secondary" style={{ marginRight: 20 }} onClick={() => { setUndeployDialogOpen(true) }}>Undeploy IOC</Button> :
+                <Button variant="contained" color="secondary" style={{ marginRight: 20 }} onClick={() => { setUndeployDialogOpen(true) }}>Undeploy</Button> :
                 <></> 
               }
             </>
           } />
         <SimpleModal open={deployDialogOpen} setOpen={setDeployDialogOpen}>
-          <DeployIOC open={deployDialogOpen} setOpen={setDeployDialogOpen} submitCallback={closeDeployModal} init={formInit} hook={useUpdateAndDeployIoc.bind(null, ioc.id)} />
+          <DeployIOC open={deployDialogOpen} setOpen={setDeployDialogOpen} submitCallback={closeDeployModal} init={formInit} hook={useUpdateAndDeployIoc.bind(null, ioc.id)}
+            hasActiveDeployment={ioc.activeDeployment} />
         </SimpleModal>
         <SimpleModal open={undeployDialogOpen} setOpen={setUndeployDialogOpen}>
           <UndeployIOC open={undeployDialogOpen} setOpen={setUndeployDialogOpen} submitCallback={closeUndeployModal} ioc={ioc} hook={useCreateUndeployment} />

src/components/IOC/IOCUndeployDialog.js

@@ -29,7 +29,7 @@ export function IOCUndeployDialog({ open, setOpen, submitCallback, ioc }) {
   return (
     <Dialog open={open} onClose={handleClose}>
       <form onSubmit={onSubmit}>
-        <DialogTitle id="form-dialog-title">Undeploy IOC</DialogTitle>
+        <DialogTitle id="form-dialog-title">Undeploy</DialogTitle>
         <DialogContent>
           <DialogContentText>
             Do you really want to undeploy {ioc.latestVersion.namingName} from {ioc.activeDeployment.host.host}?

src/views/IOC/IOCDetailsView.js

@@ -8,7 +8,7 @@ import { useHistory } from "react-router-dom";
 
 export function IOCDetailsView({ match }) {
   const id = parseInt(match.params.id);
-  const [selectedTab, setSelectedTab] = useState("Manage IOC");
+  const [selectedTab, setSelectedTab] = useState("Manage deployment");
   const [firstTime, setFirstTime] = useState(true);
   const [ioc, getIOC] = useIOC(id);
   const history = useHistory();
@@ -47,13 +47,13 @@ export function IOCDetailsView({ match }) {
                   textColor="primary"
                 >
                   {ioc && ioc.activeDeployment && <Tab label={<Typography variant="h5">Live Status</Typography>} value="Live Status" />}
-                  {ioc && <Tab label={<Typography variant="h5">Manage IOC</Typography>} value="Manage IOC" />}
+                  {ioc && <Tab label={<Typography variant="h5">Manage deployment</Typography>} value="Manage deployment" />}
                 </Tabs>
               </Grid>
             </Grid>
             <Grid item xs={12}>
               {selectedTab === "Live Status" && <IOCLiveStatus ioc={ioc} />}
-              {selectedTab === "Manage IOC" && <IOCManage ioc={ioc} getIOC={getIOC} />}
+              {selectedTab === "Manage deployment" && <IOCManage ioc={ioc} getIOC={getIOC} />}
             </Grid>
           </Grid>
         </Paper>