Merge branch 'ICSHWI-10608_Revising_texts' into 'develop'

ICSHWI-10608: Revising texts

See merge request !228

src/__tests__/browse-deployments-test.js

@@ -25,7 +25,7 @@ defineFeature(feature, (test) => {
       });
 
       then('they should not get Access deniend', async () => {
-        expect(await screen.findByText(/IOC Name/i)).toBeInTheDocument();
+        expect(await screen.findByText(/IOC name/i)).toBeInTheDocument();
       });
   });
 

src/components/IOC/IOCDelete.js

@@ -72,7 +72,7 @@ export default function IOCDelete({ ioc, buttonDisabled }) {
         disabledButtonTitle = "There is an ongoing operation, you can not delete the IOC right now";
     }
 
-    let differentOwnerButtonTitle = "Only owner of the IOC can delete the IOC";
+    let differentOwnerButtonTitle = "Only mainainer of the IOC can delete the IOC";
 
     return (
         <>

src/components/IOC/IOCDetailAdmin.js

@@ -144,11 +144,11 @@ export default function IOCDetailAdmin({ ioc, getIOC, resetTab, buttonDisabled }
             <Autocomplete
                 className={classes.textField}
                 autoHighlight
-                id="owner"
+                id="maintainer"
                 options={users}
                 getOptionLabel={(option) => { return option }}
                 defaultValue={owner}
-                renderInput={(params) => <TextField {...params} label="Owner" variant="outlined" fullWidth required />}
+                renderInput={(params) => <TextField {...params} label="Maintainer" variant="outlined" fullWidth required />}
                 onChange={(event, value, reason) => {setOwner(value); setError(null);}}
                 disabled={disabled}
                 autoSelect

src/components/IOC/IOCLiveStatus.js

@@ -42,7 +42,7 @@ export function IOCLiveStatus({ ioc }) {
           }
         </Typography>
         : grayOutNoText,
-        "Owner": ioc.owner
+        "Maintainer": ioc.owner
     }
 
     //show comment only for deployments and where comment field is filled

src/components/IOC/IOCTable.js

@@ -7,7 +7,7 @@ import { useRedirect } from '../../hooks/Redirect';
 
 const ownIocsColumns = [
   { id: "status", label: 'Status', width: '8ch', textAlign: "center" },
-  { id: "namingName", label: 'IOC Name', width: '15ch', sortable: false },
+  { id: "namingName", label: 'IOC name', width: '15ch', sortable: false },
   { id: "host", label: 'Host', width: '10ch', sortable: false },
   { id: "network", label: 'Network', width: '10ch', sortable: false },
   { id: "sourceVersion", label: 'Reference', width: '12ch', sortable: false },
@@ -15,16 +15,16 @@ const ownIocsColumns = [
 
 const exploreIocsColumns = [
   { id: "status", label: 'Status', width: '8ch', textAlign: "center" },
-  { id: "namingName", label: 'IOC Name', width: '15ch', sortable: false },
+  { id: "namingName", label: 'IOC name', width: '15ch', sortable: false },
   { id: "host", label: 'Host', width: '10ch', sortable: false },
   { id: "network", label: 'Network', width: '10ch', sortable: false },
-  { id: "owner", label: 'Owner', width: '13ch', sortable: false },
+  { id: "owner", label: 'Maintainer', width: '13ch', sortable: false },
   { id: "sourceVersion", label: 'Reference', width: '12ch', sortable: false },
 ]
 
 const hostDetailsColumns = [
   { id: "status", label: 'Status', width: '8ch', textAlign: "center" },
-  { id: "namingName", label: 'IOC Name', width: '15ch', sortable: false },
+  { id: "namingName", label: 'IOC name', width: '15ch', sortable: false },
   { id: "sourceVersion", label: 'Reference', width: '12ch', sortable: false },
 ]
 

src/components/IOC/IOCTable.spec.js

@@ -4,7 +4,7 @@ import { composeStories } from "@storybook/testing-react";
 import * as stories from "./IOCTable.stories";
 
 const {AfterAsync} = composeStories(stories)
-const textColumns = ["IOC Name", "Host", "Network", "Owner", "Reference"];
+const textColumns = ["IOC name", "Host", "Network", "Maintainer", "Reference"];
 const columns = ["Status"].concat(textColumns);
 const firstRowData = ["Active", "VacS-RFQ:SC-IOC-130", "vacs-accv-vm-ioc", "ChannelAccess-FEB", "krisztianloki", "1.0.0"]
 

src/components/Job/JobTable.js

@@ -14,7 +14,7 @@ const formatJobDate = (value) => {
 
 const jobLogColumns = [
   { id: 'type', label: 'Type', width: '8ch', textAlign: "center"},
-  { id: 'ioc', label: 'IOC Name', width: '15ch', sortable: false },
+  { id: 'ioc', label: 'IOC name', width: '15ch', sortable: false },
   { id: 'host', label: 'Host', width: '15ch', sortable: false },
   { id: 'network', label: 'Network', width: '10ch', sortable: false },
   { id: 'user', label: 'User', width: '10ch', sortable: false },

src/components/common/SearchBar/SearchBar.js

@@ -4,7 +4,7 @@ import { useEffect, useState } from "react";
 import { useEffectAfterMount } from "../../../hooks/MountEffects";
 import { useTypingTimer } from "../SearchBoxFilter/TypingTimer";
 
-export function SearchBar({ search, loading = false, placeholder = "search", children }) {
+export function SearchBar({ search, loading = false, placeholder = "Search", children }) {
   const [queryString, stillTyping] = useTypingTimer();
   const [showAnimation, setShowAnimation] = useState(false);
   const [checkMarkOn, setCheckMarkOn] = useState(false);

src/components/common/SearchBoxFilter/SearchBoxFilter.js

@@ -23,7 +23,7 @@ export function SearchBoxFilter({ items, filter, render }) {
 
   return (
     <Container>
-      <TextField className={classes.searchText} fullWidth variant="outlined" label="search" onKeyUp={searchKeyPress} />
+      <TextField className={classes.searchText} fullWidth variant="outlined" label="Search" onKeyUp={searchKeyPress} />
       <div>&nbsp;</div>
       {render(filteredItems)}
     </Container>

src/components/deployments/DeploymentsTable.js

@@ -14,7 +14,7 @@ const formatDeploymentDate = (value) => {
 
 const columns = [
   { id: 'type', label: 'Type', width: '8ch', textAlign: "center"},
-  { id: 'ioc', label: 'IOC Name', width: '15ch', sortable: true },
+  { id: 'ioc', label: 'IOC name', width: '15ch', sortable: true },
   { id: 'host', label: 'Host', width: '15ch', sortable: false },
   { id: 'network', label: 'Network', width: '10ch', sortable: false },
   { id: 'user', label: 'User', width: '10ch', sortable: true },

src/components/deployments/DeploymentsTable.spec.js

@@ -4,7 +4,7 @@ import { composeStories } from "@storybook/testing-react";
 import * as stories from "./DeploymentsTable.stories";
 
 const {AfterAsync} = composeStories(stories)
-const textColumns = ["IOC Name", "Host", "Network", "User", "Reference", "Time"];
+const textColumns = ["IOC name", "Host", "Network", "User", "Reference", "Time"];
 const columns = ["Type"].concat(textColumns);
 const firstRowData = ["Deployment", "YMIR-TS:SC-IOC-002", "ymir-ts-ipc-02", "NIN-Inst-Ymir", "nicklasholmberg2", "96af1a85", "Not started yet"]
 

src/views/IOC/IOCListView.js

@@ -72,7 +72,7 @@ export function IOCListView() {
     useGlobalAppBar(title);
 
     let content = (
-        <SearchBar search={setQuery} loading={loading} placeholder="search in IOC name or user">
+        <SearchBar search={setQuery} loading={loading} placeholder="Search in IOC name or user">
             <IOCAsyncList iocs={iocList} setIocs={setIocList} loading={loading} rowType="explore"
                 lazyParams={lazyParams} setLazyParams={setLazyParams} totalCount={iocs.totalCount}
                 rowsPerPage={rowsPerPage} />

src/views/jobs/JobListView.js

@@ -92,7 +92,7 @@ export function JobListView() {
   }, [operations, setJobList])
 
   const content = (
-    <SearchBar search={setQuery} loading={loading} placeholder="search in IOC name, user or git reference">
+    <SearchBar search={setQuery} loading={loading} placeholder="Search in IOC name, user or git reference">
       <JobAsyncList
         jobs={jobList} setJobs={setJobList} loading={loading}
         totalCount={operations.totalCount} lazyParams={lazyParams} setLazyParams={setLazyParams}