diff --git a/src/components/IOC/IOCAsyncList.js b/src/components/IOC/IOCAsyncList.js
index 7bf11a9f07bdcfe686c0b67945985e8c5e8ce94c..e51710ef9b6bb43dc06b86dd303cacdd686ac8ea 100644
--- a/src/components/IOC/IOCAsyncList.js
+++ b/src/components/IOC/IOCAsyncList.js
@@ -4,7 +4,7 @@ import { IOCDetailFetcher } from "./IOCDetailFetcher";
import { IOCList } from "./IOCList";
import { IOCTable } from "./IOCTable";
-export function IOCAsyncList({ iocs, setIocs, rowType, totalCount, lazyParams, setLazyParams, columnSort, setColumnSort, rowsPerPage, loading, asyncDetails = true}) {
+export function IOCAsyncList({ iocs, setIocs, rowType, totalCount, lazyParams, setLazyParams, rowsPerPage, loading, asyncDetails = true}) {
return(
<>
<Hidden smUp>
@@ -12,7 +12,7 @@ export function IOCAsyncList({ iocs, setIocs, rowType, totalCount, lazyParams, s
</Hidden>
<Hidden xsDown>
<IOCTable iocs={iocs} setIocs={setIocs} loading={loading} rowType={rowType}
- lazyParams={lazyParams} setLazyParams={setLazyParams} columnSort={columnSort} setColumnSort={setColumnSort} totalCount={totalCount}
+ lazyParams={lazyParams} setLazyParams={setLazyParams} totalCount={totalCount}
rowsPerPage={rowsPerPage} />
</Hidden>
{asyncDetails && iocs.map((ioc, index) => <IOCDetailFetcher key={`ioc-${ioc.id}`} ioc={ioc} index={index} setIocs={setIocs} />)}
diff --git a/src/components/IOC/IOCTable.js b/src/components/IOC/IOCTable.js
index a981a353dfe7836be01d7679a238495b10031cb9..5f217215d70f207b846af61ce196505199922dc4 100644
--- a/src/components/IOC/IOCTable.js
+++ b/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: true },
+ { 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: true },
+ { 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: true },
+ { id: "owner", label: 'Owner', 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: true },
+ { id: "namingName", label: 'IOC Name', width: '15ch', sortable: false },
{ id: "sourceVersion", label: 'Reference', width: '12ch', sortable: false },
]
@@ -107,7 +107,7 @@ function createTableRowForExploreIocs(ioc) {
};
}
-export function IOCTable({ iocs, rowType = "own", totalCount, lazyParams, setLazyParams, columnSort, setColumnSort, rowsPerPage, loading, paginator }) {
+export function IOCTable({ iocs, rowType = "own", totalCount, lazyParams, setLazyParams, rowsPerPage, loading, paginator }) {
const tableTypeSpecifics = {
"own": [ownIocsColumns, createTableRowForOwnIocs],
"host": [hostDetailsColumns, createTableRowForHostDetails],
@@ -133,8 +133,6 @@ export function IOCTable({ iocs, rowType = "own", totalCount, lazyParams, setLaz
itemLink={itemLink}
lazyParams={lazyParams}
setLazyParams={setLazyParams}
- columnSort={columnSort}
- setColumnSort={setColumnSort}
rowsPerPage={rowsPerPage}
loading={loading}
paginator={paginator}
diff --git a/src/components/Job/JobAsyncList.js b/src/components/Job/JobAsyncList.js
index b9d0f97e8c20f88db6d17ef0ba906e8913af2067..e39b319b3d39f4be982ca0c1fa96705348a81ac1 100644
--- a/src/components/Job/JobAsyncList.js
+++ b/src/components/Job/JobAsyncList.js
@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
import { useTagsAndCommitIds, useCSentryHost } from "../../api/SwaggerApi";
import { JobTable } from './JobTable';
-export function JobAsyncList({ jobs, setJobs, rowType, totalCount, lazyParams, setLazyParams, columnSort, setColumnSort, rowsPerPage, loading, paginator, deploymentId }) {
+export function JobAsyncList({ jobs, setJobs, rowType, totalCount, lazyParams, setLazyParams, rowsPerPage, loading, paginator, deploymentId }) {
const jobDetailFetchers =
jobs?.map((job, index) => <JobDetailFetcher
key={`${job.type}-fetcher-${job.id}`} deployment={job} index={index} setDeployments={setJobs} />);
@@ -10,7 +10,7 @@ export function JobAsyncList({ jobs, setJobs, rowType, totalCount, lazyParams, s
<>
<JobTable
jobs={jobs} rowType={rowType} loading={loading}
- totalCount={totalCount} lazyParams={lazyParams} setLazyParams={setLazyParams} columnSort={columnSort} setColumnSort={setColumnSort}
+ totalCount={totalCount} lazyParams={lazyParams} setLazyParams={setLazyParams}
rowsPerPage={rowsPerPage} deploymentId={deploymentId}
/>
{jobDetailFetchers}
diff --git a/src/components/Job/JobTable.js b/src/components/Job/JobTable.js
index 287bb1d8e2ec232152caf087295baaac19e87858..1ce76315cdf18819f27e9ff38824f5b1c1637347 100644
--- a/src/components/Job/JobTable.js
+++ b/src/components/Job/JobTable.js
@@ -14,12 +14,12 @@ const formatJobDate = (value) => {
const jobLogColumns = [
{ 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: false },
{ id: 'host', label: 'Host', width: '15ch', sortable: false },
{ id: 'network', label: 'Network', width: '10ch', sortable: false },
- { id: 'user', label: 'User', width: '10ch', sortable: true },
- { id: 'version', label: 'Reference', width: '10ch', sortable: true },
- { id: 'start', label: 'Time', width: '15ch', sortable: true }
+ { id: 'user', label: 'User', width: '10ch', sortable: false },
+ { id: 'version', label: 'Reference', width: '10ch', sortable: false },
+ { id: 'start', label: 'Time', width: '15ch', sortable: false }
];
const iocServiceControlColumns = [
@@ -66,7 +66,7 @@ function createTableRowJobLog(job, deploymentId) {
return createTableRow(job, deploymentId, "black")
}
-export function JobTable({ jobs, rowType = "jobLog", totalCount, lazyParams, setLazyParams, columnSort, setColumnSort, rowsPerPage, loading, deploymentId}) {
+export function JobTable({ jobs, rowType = "jobLog", totalCount, lazyParams, setLazyParams, rowsPerPage, loading, deploymentId}) {
const tableTypeSpecifics = {
"jobLog": [jobLogColumns, createTableRowJobLog],
@@ -90,7 +90,7 @@ export function JobTable({ jobs, rowType = "jobLog", totalCount, lazyParams, set
return (
<CustomTable columns={columns} rows={jobs?.map(job => createRow(job, deploymentId))} handleRowClick={onRowClicked} itemLink={itemLink}
- totalCount={totalCount} lazyParams={lazyParams} setLazyParams={setLazyParams} columnSort={columnSort} setColumnSort={setColumnSort}
+ totalCount={totalCount} lazyParams={lazyParams} setLazyParams={setLazyParams}
rowsPerPage={rowsPerPage} loading={loading} />
);
}
\ No newline at end of file
diff --git a/src/components/common/table/CustomTable.js b/src/components/common/table/CustomTable.js
index 730c773766e503eb50d0c6d04e3c0f82af7e32b3..c3a33d5c11b288302d1c1f00481241ce2821fa88 100644
--- a/src/components/common/table/CustomTable.js
+++ b/src/components/common/table/CustomTable.js
@@ -91,8 +91,8 @@ export function CustomTable(props) {
first={lazyParams.first}
onPage={onPage}
onSort={onSort}
- sortField={columnSort.sortField}
- sortOrder={columnSort.sortOrder}
+ sortField={columnSort?.sortField}
+ sortOrder={columnSort?.sortOrder}
value={rows}
stripedRows
scrollable
diff --git a/src/components/host/HostTable.js b/src/components/host/HostTable.js
index 0e31c66e2a3fa2549fd0aba97bd54da4664b703d..2dab7528d5eb28a056ddb49a0bb65b9adbfba642 100644
--- a/src/components/host/HostTable.js
+++ b/src/components/host/HostTable.js
@@ -46,7 +46,7 @@ export function createRow(hostContainer) {
}
-export function HostTable({ hosts, totalCount, lazyParams, setLazyParams, columnSort, setColumnSort, rowsPerPage, loading}) {
+export function HostTable({ hosts, totalCount, lazyParams, setLazyParams, rowsPerPage, loading}) {
const redirect = useRedirect();
const itemLink = id => `/hosts/${id}`;
@@ -56,5 +56,5 @@ export function HostTable({ hosts, totalCount, lazyParams, setLazyParams, column
};
return <CustomTable columns={columns} rows={hosts.map(host => createRow(host))} handleRowClick={onRowClicked} itemLink={itemLink} totalCount={totalCount}
- lazyParams={lazyParams} setLazyParams={setLazyParams} columnSort={columnSort} setColumnSort={setColumnSort} rowsPerPage={rowsPerPage} loading={loading} />;
+ lazyParams={lazyParams} setLazyParams={setLazyParams} rowsPerPage={rowsPerPage} loading={loading} />;
}
\ No newline at end of file
diff --git a/src/views/IOC/IOCListView.js b/src/views/IOC/IOCListView.js
index 3f8d36aa609174b042ffa0c17d4ff68ccff4c357..3463171dd27f1290602842ca5831f16aa5d03e44 100644
--- a/src/views/IOC/IOCListView.js
+++ b/src/views/IOC/IOCListView.js
@@ -45,11 +45,6 @@ export function IOCListView() {
page: 0
});
- const [columnSort, setColumnSort] = useState({
- sortField: null,
- sortOrder: null
- });
-
const handleChangeOwn = (event) => {
const own = event.target.checked;
setOwnOnly(own);
@@ -62,24 +57,16 @@ export function IOCListView() {
}, [iocs, setIocList])
useEffect(() => {
- let requestParams = initRequestParams(lazyParams, query, columnSort);
+ let requestParams = initRequestParams(lazyParams, query);
if (ownOnly) {
requestParams.owner = user?.loginName;
}
- if (columnSort.sortField === "owner") {
- requestParams.order_by = "OWNER";
- }
-
- if (columnSort.sortField === "namingName") {
- requestParams.order_by = "IOC_NAME";
- }
-
requestParams.deployment_status = deploymentStatus;
getIocs(requestParams);
- }, [getIocs, lazyParams, columnSort, query, user, ownOnly, deploymentStatus])
+ }, [getIocs, lazyParams, query, user, ownOnly, deploymentStatus])
const title = "IOCs";
useGlobalAppBar(title);
@@ -87,7 +74,7 @@ export function IOCListView() {
let content = (
<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} columnSort={columnSort} setColumnSort={setColumnSort} totalCount={iocs.totalCount}
+ lazyParams={lazyParams} setLazyParams={setLazyParams} totalCount={iocs.totalCount}
rowsPerPage={rowsPerPage} />
</SearchBar>
);
diff --git a/src/views/home/HomeView.js b/src/views/home/HomeView.js
index a482d581c4ab8eaf878201757ef5e06a696ebd48..66d4ebfca5800d749f45a6a7b3d73be374629cb7 100644
--- a/src/views/home/HomeView.js
+++ b/src/views/home/HomeView.js
@@ -33,13 +33,6 @@ export function HomeView() {
page: 0
});
- const [columnSort, setColumnSort] = useState({
- sortField: null,
- sortOrder: null
- });
-
- console.log("rendering Own IOCs")
-
useGlobalAppBar("Home");
const closeModal = () => {
@@ -76,7 +69,6 @@ export function HomeView() {
<SimpleAccordion summary="IOCs with issues" defaultExpanded>
<IOCAsyncList iocs={iocsWithAlarms} asyncDetails={false} rowType="own" loading={loading}
lazyParams={lazyParams} setLazyParams={setLazyParams}
- columnSort={columnSort} setColumnSort={setColumnSort}
totalCount={iocsWithAlarms?.length}
paginator={false} />
</SimpleAccordion>
diff --git a/src/views/host/HostListView.js b/src/views/host/HostListView.js
index eef6af8ae9ce3a037406a4861bdcc5b28f5231e3..4cdd96d003548d345177309c3f09a15efc009193 100644
--- a/src/views/host/HostListView.js
+++ b/src/views/host/HostListView.js
@@ -66,19 +66,14 @@ export function HostListView() {
page: 0
});
- const [columnSort, setColumnSort] = useState({
- sortField: null,
- sortOrder: null
- });
-
const rowsPerPage = [20, 50];
useEffect(() => {
- let requestParams = initRequestParams(lazyParams, transformHostQuery(query), columnSort);
+ let requestParams = initRequestParams(lazyParams, transformHostQuery(query));
requestParams.filter = ((hostFilter !== "NO_IOCS") && ownOnly) ? "OWN" : hostFilter;
getHosts(requestParams);
- }, [getHosts, lazyParams, query, columnSort, hostFilter, ownOnly])
+ }, [getHosts, lazyParams, query, hostFilter, ownOnly])
const content = (
<>
@@ -88,7 +83,7 @@ export function HostListView() {
</Hidden>
<Hidden xsDown>
<HostTable hosts={hosts.hostList} loading={loading}
- totalCount={hosts.totalCount} lazyParams={lazyParams} setLazyParams={setLazyParams} columnSort={columnSort} setColumnSort={setColumnSort}
+ totalCount={hosts.totalCount} lazyParams={lazyParams} setLazyParams={setLazyParams}
rowsPerPage={rowsPerPage} />
</Hidden>
</SearchBar>
diff --git a/src/views/jobs/JobListView.js b/src/views/jobs/JobListView.js
index f06b9a71645d4b4a5aa32189f9d7a20ff8e83402..99eda11d80091092ec790e349675b0cf1ac8ab67 100644
--- a/src/views/jobs/JobListView.js
+++ b/src/views/jobs/JobListView.js
@@ -65,37 +65,16 @@ export function JobListView() {
page: 0
});
- const [columnSort, setColumnSort] = useState({
- sortField: null,
- sortOrder: null
- });
-
const rowsPerPage = [20, 50];
useEffect(() => {
- let requestParams = initRequestParams(lazyParams, query, columnSort);
+ let requestParams = initRequestParams(lazyParams, query);
if (ownOnly) {
requestParams.user = user?.loginName;
}
- if (columnSort.sortField === "start") {
- requestParams.order_by = "TIME";
- }
-
- if (columnSort.sortField === "user") {
- requestParams.order_by = "USER";
- }
-
- if (columnSort.sortField === "ioc") {
- requestParams.order_by = "IOC_NAME";
- }
-
- if (columnSort.sortField === "version") {
- requestParams.order_by = "GIT_REFERENCE";
- }
-
if (deploymentStatus) {
requestParams.status = deploymentStatus;
}
@@ -106,7 +85,7 @@ export function JobListView() {
getOperations(requestParams);
- }, [getOperations, lazyParams, query, columnSort, user, deploymentStatus, ownOnly, jobType])
+ }, [getOperations, lazyParams, query, user, deploymentStatus, ownOnly, jobType])
useEffect(() => {
setJobList(operations.operationsList);
@@ -116,7 +95,7 @@ export function JobListView() {
<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} columnSort={columnSort} setColumnSort={setColumnSort}
+ totalCount={operations.totalCount} lazyParams={lazyParams} setLazyParams={setLazyParams}
rowsPerPage={rowsPerPage} />
</SearchBar>
);