Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
ce-deploy-ui
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ccce
dev
ce-deploy-ui
Commits
7a7cca7b
Commit
7a7cca7b
authored
1 year ago
by
cjenkscybercom
Browse files
Options
Downloads
Patches
Plain Diff
CE-2203
: modify host details ioc table col widths, remove own-iocs
parent
faeabc67
No related branches found
No related tags found
2 merge requests
!407
CE-2141: 3.0.0
,
!405
Qa release tasks
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/IOC/IOCTable/IOCTable.js
+3
-51
3 additions, 51 deletions
src/components/IOC/IOCTable/IOCTable.js
src/components/common/LabeledIcon/LabeledIcon.js
+0
-2
0 additions, 2 deletions
src/components/common/LabeledIcon/LabeledIcon.js
with
3 additions
and
53 deletions
src/components/IOC/IOCTable/IOCTable.js
+
3
−
51
View file @
7a7cca7b
...
...
@@ -5,30 +5,6 @@ import { IOCDescription } from "./IOCDescription";
import
{
IOCStatus
}
from
"
./IOCStatus
"
;
import
{
noWrapText
}
from
"
../../common/Helper
"
;
const
ownIocsColumns
=
[
{
field
:
"
status
"
,
headerName
:
"
Status
"
,
flex
:
0
,
headerAlign
:
"
center
"
,
align
:
"
center
"
},
{
field
:
"
namingName
"
,
headerName
:
"
IOC name
"
,
width
:
"
15ch
"
,
sortable
:
false
},
{
field
:
"
description
"
,
headerName
:
"
Description
"
,
width
:
"
20ch
"
,
sortable
:
false
},
{
field
:
"
host
"
,
headerName
:
"
Host
"
,
width
:
"
10ch
"
,
sortable
:
false
},
{
field
:
"
network
"
,
headerName
:
"
Network
"
,
width
:
"
10ch
"
,
sortable
:
false
}
];
const
exploreIocsColumns
=
[
{
field
:
"
status
"
,
...
...
@@ -40,13 +16,11 @@ const exploreIocsColumns = [
{
field
:
"
namingName
"
,
headerName
:
"
IOC name
"
,
width
:
"
15ch
"
,
sortable
:
false
},
{
field
:
"
description
"
,
headerName
:
"
Description
"
,
width
:
"
20ch
"
,
sortable
:
false
},
{
field
:
"
host
"
,
headerName
:
"
Host
"
,
width
:
"
10ch
"
,
sortable
:
false
},
...
...
@@ -64,14 +38,13 @@ const hostDetailsColumns = [
{
field
:
"
namingName
"
,
headerName
:
"
IOC name
"
,
width
:
"
8ch
"
,
sortable
:
false
},
{
field
:
"
description
"
,
headerName
:
"
Description
"
,
width
:
"
20ch
"
,
sortab
le
:
false
sortable
:
false
,
f
le
x
:
3
}
];
...
...
@@ -105,26 +78,6 @@ function createTableRowForHostDetails(ioc) {
};
}
function
createTableRowForOwnIocs
(
ioc
)
{
const
{
id
,
activeDeployment
,
namingName
}
=
ioc
;
return
{
id
:
id
,
status
:
(
<
IOCStatus
id
=
{
ioc
.
id
}
activeDeployment
=
{
ioc
.
activeDeployment
}
/
>
),
namingName
:
(
<
Link
href
=
{
`/iocs/
${
id
}
`
}
>
{
noWrapText
(
namingName
??
"
---
"
)}
<
/Link
>
),
description
:
<
IOCDescription
id
=
{
ioc
.
id
}
/>
,
host
:
createHostLink
(
activeDeployment
?.
host
),
network
:
noWrapText
(
activeDeployment
?.
host
.
network
||
"
---
"
)
};
}
function
createTableRowForExploreIocs
(
ioc
)
{
const
{
id
,
namingName
,
activeDeployment
}
=
ioc
;
...
...
@@ -147,13 +100,12 @@ function createTableRowForExploreIocs(ioc) {
export
function
IOCTable
({
iocs
=
[],
rowType
=
"
own
"
,
rowType
=
"
explore
"
,
loading
,
pagination
,
onPage
})
{
const
tableTypeSpecifics
=
{
own
:
[
ownIocsColumns
,
createTableRowForOwnIocs
],
host
:
[
hostDetailsColumns
,
createTableRowForHostDetails
],
explore
:
[
exploreIocsColumns
,
createTableRowForExploreIocs
]
};
...
...
This diff is collapsed.
Click to expand it.
src/components/common/LabeledIcon/LabeledIcon.js
+
0
−
2
View file @
7a7cca7b
...
...
@@ -32,7 +32,6 @@ const LabeledIcon = React.forwardRef((props, ref) => {
className
=
{
className
}
>
<
Icon
title
=
{
label
}
titleAccess
=
{
label
}
{...
IconProps
}
/
>
...
...
@@ -42,7 +41,6 @@ const LabeledIcon = React.forwardRef((props, ref) => {
if
(
labelPosition
===
"
none
"
)
{
return
(
<
Icon
title
=
{
label
}
titleAccess
=
{
label
}
{...
IconProps
}
/
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment