Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • andersharrisson/ce-deploy-ui
  • ccce/dev/ce-deploy-ui
2 results
Show changes
Commits on Source (6)
...@@ -26,11 +26,11 @@ defineFeature(feature, (test) => { ...@@ -26,11 +26,11 @@ defineFeature(feature, (test) => {
}); });
when('the user navigates to the hosts page', async () => { when('the user navigates to the hosts page', async () => {
await screen.findByText('CCCE / Explore IOC hosts'); await screen.findByText('CCCE / IOC hosts');
}); });
then('they should be presented with a table of hosts from the iocs group in CSEntry', async () => { then('they should be presented with a table of hosts from the iocs group in CSEntry', async () => {
expect(await screen.findByText('CCCE / Explore IOC hosts')).toBeInTheDocument() expect(await screen.findByText('CCCE / IOC hosts')).toBeInTheDocument()
expect(await screen.findByText('Status')).toBeInTheDocument() expect(await screen.findByText('Status')).toBeInTheDocument()
expect(await screen.findByText('Host')).toBeInTheDocument() expect(await screen.findByText('Host')).toBeInTheDocument()
expect(await screen.findByText('Network')).toBeInTheDocument() expect(await screen.findByText('Network')).toBeInTheDocument()
......
...@@ -9,7 +9,7 @@ function IOCLiveStatusContainer() { ...@@ -9,7 +9,7 @@ function IOCLiveStatusContainer() {
const [commands, getCommands] = useCommandList(); const [commands, getCommands] = useCommandList();
const [commandParams, setCommandParams] = useState({ first: 0, rows: 5, page: 0 }); const [commandParams, setCommandParams] = useState({ first: 0, rows: 5, page: 0 });
const [columnSort, setColumnSort] = useState({ sortField: null, sortOrder: null }); const [columnSort, setColumnSort] = useState({ sortField: null, sortOrder: null });
const [rowsPerPage] = useState([5, 10, 20, 50]); const [rowsPerPage] = useState([5, 20]);
const [buttonDisabled, setButtonDisabled] = useState(false); const [buttonDisabled, setButtonDisabled] = useState(false);
useEffect(() => { useEffect(() => {
......
...@@ -30,7 +30,7 @@ export function IOCManage({ ioc, getIOC, buttonDisabled }) { ...@@ -30,7 +30,7 @@ export function IOCManage({ ioc, getIOC, buttonDisabled }) {
sortOrder: null sortOrder: null
}); });
const rowsPerPage = [5, 10, 20, 50]; const rowsPerPage = [5, 20];
useEffect(() => { useEffect(() => {
setDeploymentList(deployments.deploymentList); setDeploymentList(deployments.deploymentList);
......
...@@ -14,11 +14,11 @@ const formatDeploymentDate = (value) => { ...@@ -14,11 +14,11 @@ const formatDeploymentDate = (value) => {
const columns = [ const columns = [
{ id: 'type', label: 'Type', width: '5%'}, { id: 'type', label: 'Type', width: '5%'},
{ id: 'ioc', label: 'IOC Name', width: '16%', sortable: true }, { id: 'ioc', label: 'IOC Name', width: '20%', sortable: true },
{ id: 'host', label: 'Host', width: '19%', sortable: false }, { id: 'host', label: 'Host', width: '19%', sortable: false },
{ id: 'network', label: 'Network', width: '19%', sortable: false }, { id: 'network', label: 'Network', width: '15%', sortable: false },
{ id: 'user', label: 'User', width: '12%', sortable: true }, { id: 'user', label: 'User', width: '12%', sortable: true },
{ id: 'version', label: 'Git reference', width: '15%', sortable: true }, { id: 'version', label: 'Git reference', width: '10%', sortable: true },
{ id: 'start', label: 'Start date', width: '15%', sortable: true } { id: 'start', label: 'Start date', width: '15%', sortable: true }
]; ];
......
...@@ -386,8 +386,8 @@ export function GlobalAppBar({ children }) { ...@@ -386,8 +386,8 @@ export function GlobalAppBar({ children }) {
const makeLink = (text, url, icon) => ({ text, url, icon }); const makeLink = (text, url, icon) => ({ text, url, icon });
const menuItemsAll = [ const menuItemsAll = [
makeLink("Explore IOCs", "/iocs", <CCCEControlSymbol />), makeLink("IOCs", "/iocs", <CCCEControlSymbol />),
makeLink("Explore IOC hosts", "/hosts", <Storage />), makeLink("IOC hosts", "/hosts", <Storage />),
makeLink("Deployment log", "/deployments", <Assignment />), makeLink("Deployment log", "/deployments", <Assignment />),
makeLink("Statistics", "/statistics", <TrendingUp />), makeLink("Statistics", "/statistics", <TrendingUp />),
makeLink("About", "/about", <InfoIcon />), makeLink("About", "/about", <InfoIcon />),
...@@ -395,8 +395,8 @@ export function GlobalAppBar({ children }) { ...@@ -395,8 +395,8 @@ export function GlobalAppBar({ children }) {
] ]
const menuItemsVisitor = [ const menuItemsVisitor = [
makeLink("Explore IOCs", "/iocs", <CCCEControlSymbol />), makeLink("IOCs", "/iocs", <CCCEControlSymbol />),
makeLink("Explore IOC hosts", "/hosts", <Storage />), makeLink("IOC hosts", "/hosts", <Storage />),
makeLink("Deployment log", "/deployments", <Assignment />), makeLink("Deployment log", "/deployments", <Assignment />),
makeLink("Statistics", "/statistics", <TrendingUp />), makeLink("Statistics", "/statistics", <TrendingUp />),
makeLink("About", "/about", <InfoIcon />) makeLink("About", "/about", <InfoIcon />)
......
...@@ -32,7 +32,7 @@ export function IOCDetailsView({ ioc, getIOC, loading }) { ...@@ -32,7 +32,7 @@ export function IOCDetailsView({ ioc, getIOC, loading }) {
sortOrder: null sortOrder: null
}); });
const rowsPerPage = [5, 10, 20, 50]; const rowsPerPage = [5, 20];
useSafePolling(getIOC, loading, IOC_POLL_INTERVAL); useSafePolling(getIOC, loading, IOC_POLL_INTERVAL);
useSafePolling(getOngoingCommand, ongoingCommandLoading, IOC_POLL_INTERVAL); useSafePolling(getOngoingCommand, ongoingCommandLoading, IOC_POLL_INTERVAL);
......
...@@ -39,9 +39,7 @@ export function IOCListView() { ...@@ -39,9 +39,7 @@ export function IOCListView() {
setOwnOnly(own); setOwnOnly(own);
}; };
const rowsPerPage = [5, 10, 20, 50, 100]; const rowsPerPage = [20, 50];
console.log("rendering Explore IOCs")
useEffect(() => { useEffect(() => {
setIocList(iocs.iocList); setIocList(iocs.iocList);
...@@ -69,7 +67,7 @@ export function IOCListView() { ...@@ -69,7 +67,7 @@ export function IOCListView() {
getIocs(requestParams); getIocs(requestParams);
}, [getIocs, lazyParams, columnSort, query, user, ownOnly]) }, [getIocs, lazyParams, columnSort, query, user, ownOnly])
const title = "Explore IOCs"; const title = "IOCs";
useGlobalAppBar(title); useGlobalAppBar(title);
let content = ( let content = (
......
...@@ -57,7 +57,7 @@ export function DeploymentsView() { ...@@ -57,7 +57,7 @@ export function DeploymentsView() {
const [lazyParams, setLazyParams] = useState({ const [lazyParams, setLazyParams] = useState({
first: 0, first: 0,
rows: 10, rows: 20,
page: 0 page: 0
}); });
...@@ -66,7 +66,7 @@ export function DeploymentsView() { ...@@ -66,7 +66,7 @@ export function DeploymentsView() {
sortOrder: null sortOrder: null
}); });
const rowsPerPage = [5, 10, 20, 50]; const rowsPerPage = [20, 50];
useEffect(() => { useEffect(() => {
......
...@@ -38,7 +38,7 @@ export function HostDetailsView({ id}) { ...@@ -38,7 +38,7 @@ export function HostDetailsView({ id}) {
const [lazyParams, setLazyParams] = useState({ const [lazyParams, setLazyParams] = useState({
first: 0, first: 0,
rows: 10, rows: 5,
page: 0 page: 0
}); });
...@@ -47,7 +47,7 @@ export function HostDetailsView({ id}) { ...@@ -47,7 +47,7 @@ export function HostDetailsView({ id}) {
sortOrder: null sortOrder: null
}); });
const rowsPerPage = [5, 10, 20, 50]; const rowsPerPage = [5, 20];
useEffect(() => { useEffect(() => {
let requestParams = initRequestParams(lazyParams, null, columnSort); let requestParams = initRequestParams(lazyParams, null, columnSort);
......
...@@ -21,7 +21,7 @@ const useStyles = makeStyles((theme) => ({ ...@@ -21,7 +21,7 @@ const useStyles = makeStyles((theme) => ({
})); }));
export function HostListView() { export function HostListView() {
useGlobalAppBar("Explore IOC hosts"); useGlobalAppBar("IOC hosts");
const [hosts, getHosts, /*reset*/, loading] = useCSEntrySearch(); const [hosts, getHosts, /*reset*/, loading] = useCSEntrySearch();
const [query, setQuery] = useState(""); const [query, setQuery] = useState("");
...@@ -29,7 +29,7 @@ export function HostListView() { ...@@ -29,7 +29,7 @@ export function HostListView() {
const [lazyParams, setLazyParams] = useState({ const [lazyParams, setLazyParams] = useState({
first: 0, first: 0,
rows: 10, rows: 20,
page: 0 page: 0
}); });
...@@ -38,7 +38,7 @@ export function HostListView() { ...@@ -38,7 +38,7 @@ export function HostListView() {
sortOrder: null sortOrder: null
}); });
const rowsPerPage = [5, 10, 20, 50]; const rowsPerPage = [20, 50];
useEffect(() => { useEffect(() => {
......