[backend] add action to remove entity from draft (#6728)

opencti-platform/opencti-front/lang/front/de.json

@@ -2511,6 +2511,7 @@
   "Remove": "Entfernen",
   "Remove attribute": "Attribut entfernen",
   "Remove Filigran logos": "Filigran-Logos entfernen",
+  "Remove from draft": "Aus dem Entwurf entfernen",
   "Remove from the container": "Aus dem Container entfernen",
   "Remove from this entity": "Aus dieser Entität entfernen",
   "Remove from this object": "Aus diesem Objekt entfernen",

opencti-platform/opencti-front/lang/front/en.json

@@ -2513,6 +2513,7 @@
   "Remove": "Remove",
   "Remove attribute": "Remove attribute",
   "Remove Filigran logos": "Remove Filigran logos",
+  "Remove from draft": "Remove from draft",
   "Remove from the container": "Remove from the container",
   "Remove from this entity": "Remove from this entity",
   "Remove from this object": "Remove from this object",

opencti-platform/opencti-front/lang/front/es.json

@@ -2511,6 +2511,7 @@
   "Remove": "Borrar",
   "Remove attribute": "Quitar atributo",
   "Remove Filigran logos": "Quitar logos Filigran",
+  "Remove from draft": "Eliminar del borrador",
   "Remove from the container": "Borrar del contenedor",
   "Remove from this entity": "Quitar esta entidad",
   "Remove from this object": "Quitar este objeto",

opencti-platform/opencti-front/lang/front/fr.json

@@ -2511,6 +2511,7 @@
   "Remove": "Retirer",
   "Remove attribute": "Supprimer un attribut",
   "Remove Filigran logos": "Supprimer les logos Filigran",
+  "Remove from draft": "Retirer du projet",
   "Remove from the container": "Retirer de ce conteneur",
   "Remove from this entity": "Retirer de cette entité",
   "Remove from this object": "Retirer de cet objet",

opencti-platform/opencti-front/lang/front/ja.json

@@ -2511,6 +2511,7 @@
   "Remove": "解除",
   "Remove attribute": "属性の削除",
   "Remove Filigran logos": "フィリグランロゴの削除",
+  "Remove from draft": "ドラフトから削除",
   "Remove from the container": "コンテナから削除する",
   "Remove from this entity": "このエンティティから削除する",
   "Remove from this object": "このオブジェクトから削除する",

opencti-platform/opencti-front/lang/front/ko.json

@@ -2511,6 +2511,7 @@
   "Remove": "제거",
   "Remove attribute": "속성 제거",
   "Remove Filigran logos": "Filigran 로고 제거",
+  "Remove from draft": "초안에서 제거",
   "Remove from the container": "컨테이너에서 제거",
   "Remove from this entity": "이 엔터티에서 제거",
   "Remove from this object": "이 객체에서 제거",

opencti-platform/opencti-front/lang/front/zh.json

@@ -2511,6 +2511,7 @@
   "Remove": "移除",
   "Remove attribute": "删除属性",
   "Remove Filigran logos": "移除 Filigran 标识",
+  "Remove from draft": "从草案中删除",
   "Remove from the container": "从容器中取出",
   "Remove from this entity": "从该实体中移除",
   "Remove from this object": "从该对象中移除",

opencti-platform/opencti-front/src/components/dataGrid/DataTable.tsx

@@ -104,6 +104,7 @@ type DataTableInternalToolbarProps = Pick<DataTableProps,
 | 'toolbarFilters'
 | 'handleCopy'
 | 'removeAuthMembersEnabled'
+| 'removeFromDraftEnabled'
 > & {
   taskScope?: string
   globalSearch?: string;
@@ -115,6 +116,7 @@ const DataTableInternalToolbar = ({
   toolbarFilters,
   globalSearch,
   removeAuthMembersEnabled,
+  removeFromDraftEnabled,
 }: DataTableInternalToolbarProps) => {
   const theme = useTheme<Theme>();
 
@@ -150,6 +152,7 @@ const DataTableInternalToolbar = ({
         taskScope={taskScope}
         handleCopy={handleCopy}
         removeAuthMembersEnabled={removeAuthMembersEnabled}
+        removeFromDraftEnabled={removeFromDraftEnabled}
       />
     </div>
   );
@@ -205,6 +208,7 @@ const DataTable = (props: OCTIDataTableProps) => {
     hideFilters,
     taskScope,
     removeAuthMembersEnabled,
+    removeFromDraftEnabled,
   } = props;
 
   const settingsMessagesBannerHeight = useSettingsMessagesBannerHeight();
@@ -257,6 +261,7 @@ const DataTable = (props: OCTIDataTableProps) => {
             toolbarFilters={toolbarFilters}
             globalSearch={globalSearch}
             removeAuthMembersEnabled={removeAuthMembersEnabled}
+            removeFromDraftEnabled={removeFromDraftEnabled}
           />
       )}
       />

opencti-platform/opencti-front/src/components/dataGrid/dataTableTypes.ts

@@ -132,6 +132,7 @@ export interface DataTableProps {
   disableToolBar?: boolean
   disableSelectAll?: boolean
   removeAuthMembersEnabled?: boolean
+  removeFromDraftEnabled?: boolean
   selectOnLineClick?: boolean
   onLineClick?: (line: any) => void
   hideHeaders?: boolean

opencti-platform/opencti-front/src/components/dataGrid/dataTableUtils.tsx

@@ -1185,7 +1185,7 @@ const defaultColumns: DataTableProps['dataColumns'] = {
     isSortable: false,
     render: ({ draftVersion }) => (
       <ItemOperations
-        draftOperation={draftVersion.draft_operation}
+        draftOperation={draftVersion?.draft_operation}
       />
     ),
   },

opencti-platform/opencti-front/src/private/components/common/stix_core_relationships/EntityStixCoreRelationshipLineAll.jsx

@@ -13,14 +13,15 @@ import Skeleton from '@mui/material/Skeleton';
 import { AutoFix } from 'mdi-material-ui';
 import Tooltip from '@mui/material/Tooltip';
 import Checkbox from '@mui/material/Checkbox';
+import withTheme from '@mui/styles/withTheme';
 import inject18n from '../../../../components/i18n';
 import ItemIcon from '../../../../components/ItemIcon';
 import ItemConfidence from '../../../../components/ItemConfidence';
 import StixCoreRelationshipPopover from './StixCoreRelationshipPopover';
 import { getMainRepresentative } from '../../../../utils/defaultRepresentatives';
 import ItemMarkings from '../../../../components/ItemMarkings';
 import ItemEntityType from '../../../../components/ItemEntityType';
-import { DraftChip } from '../draft/DraftChip';
+import { DraftChip, getDraftModeColor } from '../draft/DraftChip';
 
 const styles = (theme) => ({
   item: {
@@ -55,6 +56,7 @@ class EntityStixCoreRelationshipLineAllComponent extends Component {
       entityId,
       fsd,
       t,
+      theme,
       classes,
       dataColumns,
       node,
@@ -97,7 +99,7 @@ class EntityStixCoreRelationshipLineAllComponent extends Component {
           />
         </ListItemIcon>
         <ListItemIcon classes={{ root: classes.itemIcon }}>
-          <ItemIcon type={node.entity_type} />
+          <ItemIcon type={node.entity_type} color={node.draftVersion ? getDraftModeColor(theme) : null } />
         </ListItemIcon>
         <ListItemText
           primary={
@@ -221,6 +223,10 @@ const EntityStixCoreRelationshipLineAllFragment = createFragmentContainer(
     node: graphql`
       fragment EntityStixCoreRelationshipLineAll_node on StixCoreRelationship {
         id
+        draftVersion {
+          draft_id
+          draft_operation
+        }
         entity_type
         parent_types
         relationship_type
@@ -538,6 +544,7 @@ const EntityStixCoreRelationshipLineAllFragment = createFragmentContainer(
 export const EntityStixCoreRelationshipLineAll = R.compose(
   inject18n,
   withStyles(styles),
+  withTheme,
 )(EntityStixCoreRelationshipLineAllFragment);
 
 class EntityStixCoreRelationshipLineAllDummyComponent extends Component {

opencti-platform/opencti-front/src/private/components/common/stix_core_relationships/EntityStixCoreRelationshipLineFrom.jsx

@@ -13,14 +13,15 @@ import Skeleton from '@mui/material/Skeleton';
 import { AutoFix } from 'mdi-material-ui';
 import Tooltip from '@mui/material/Tooltip';
 import Checkbox from '@mui/material/Checkbox';
+import withTheme from '@mui/styles/withTheme';
 import inject18n from '../../../../components/i18n';
 import ItemIcon from '../../../../components/ItemIcon';
 import ItemConfidence from '../../../../components/ItemConfidence';
 import StixCoreRelationshipPopover from './StixCoreRelationshipPopover';
 import { getMainRepresentative } from '../../../../utils/defaultRepresentatives';
 import ItemMarkings from '../../../../components/ItemMarkings';
 import ItemEntityType from '../../../../components/ItemEntityType';
-import { DraftChip } from '../draft/DraftChip';
+import { DraftChip, getDraftModeColor } from '../draft/DraftChip';
 
 const styles = (theme) => ({
   item: {
@@ -58,6 +59,7 @@ class EntityStixCoreRelationshipLineFromComponent extends Component {
     const {
       fsd,
       t,
+      theme,
       classes,
       dataColumns,
       node,
@@ -99,7 +101,7 @@ class EntityStixCoreRelationshipLineFromComponent extends Component {
           />
         </ListItemIcon>
         <ListItemIcon classes={{ root: classes.itemIcon }}>
-          <ItemIcon type={node.entity_type} />
+          <ItemIcon type={node.entity_type} color={node.draftVersion ? getDraftModeColor(theme) : null } />
         </ListItemIcon>
         <ListItemText
           primary={
@@ -222,6 +224,10 @@ const EntityStixCoreRelationshipLineFromFragment = createFragmentContainer(
     node: graphql`
       fragment EntityStixCoreRelationshipLineFrom_node on StixCoreRelationship {
         id
+        draftVersion {
+          draft_id
+          draft_operation
+        }
         entity_type
         parent_types
         relationship_type
@@ -571,6 +577,7 @@ const EntityStixCoreRelationshipLineFromFragment = createFragmentContainer(
 export const EntityStixCoreRelationshipLineFrom = R.compose(
   inject18n,
   withStyles(styles),
+  withTheme,
 )(EntityStixCoreRelationshipLineFromFragment);
 
 class EntityStixCoreRelationshipLineFromDummyComponent extends Component {

opencti-platform/opencti-front/src/private/components/common/stix_core_relationships/EntityStixCoreRelationshipLineTo.jsx

@@ -13,14 +13,15 @@ import { AutoFix } from 'mdi-material-ui';
 import Skeleton from '@mui/material/Skeleton';
 import Tooltip from '@mui/material/Tooltip';
 import Checkbox from '@mui/material/Checkbox';
+import withTheme from '@mui/styles/withTheme';
 import inject18n from '../../../../components/i18n';
 import ItemIcon from '../../../../components/ItemIcon';
 import ItemConfidence from '../../../../components/ItemConfidence';
 import StixCoreRelationshipPopover from './StixCoreRelationshipPopover';
 import { getMainRepresentative } from '../../../../utils/defaultRepresentatives';
 import ItemMarkings from '../../../../components/ItemMarkings';
 import ItemEntityType from '../../../../components/ItemEntityType';
-import { DraftChip } from '../draft/DraftChip';
+import { DraftChip, getDraftModeColor } from '../draft/DraftChip';
 
 const styles = (theme) => ({
   item: {
@@ -54,6 +55,7 @@ class EntityStixCoreRelationshipLineToComponent extends Component {
     const {
       fsd,
       t,
+      theme,
       classes,
       dataColumns,
       node,
@@ -94,7 +96,7 @@ class EntityStixCoreRelationshipLineToComponent extends Component {
           />
         </ListItemIcon>
         <ListItemIcon classes={{ root: classes.itemIcon }}>
-          <ItemIcon type={node.entity_type} />
+          <ItemIcon type={node.entity_type} color={node.draftVersion ? getDraftModeColor(theme) : null } />
         </ListItemIcon>
         <ListItemText
           primary={
@@ -216,6 +218,10 @@ const EntityStixCoreRelationshipLineToFragment = createFragmentContainer(
     node: graphql`
       fragment EntityStixCoreRelationshipLineTo_node on StixCoreRelationship {
         id
+        draftVersion {
+          draft_id
+          draft_operation
+        }
         entity_type
         parent_types
         relationship_type
@@ -569,6 +575,7 @@ const EntityStixCoreRelationshipLineToFragment = createFragmentContainer(
 export const EntityStixCoreRelationshipLineTo = R.compose(
   inject18n,
   withStyles(styles),
+  withTheme,
 )(EntityStixCoreRelationshipLineToFragment);
 
 class EntityStixCoreRelationshipLineToDummyComponent extends Component {

opencti-platform/opencti-front/src/private/components/common/stix_core_relationships/SimpleStixObjectOrStixRelationshipStixCoreRelationshipLine.jsx

@@ -4,6 +4,7 @@ import { compose } from 'ramda';
 import { Link } from 'react-router-dom';
 import { graphql, createFragmentContainer } from 'react-relay';
 import withStyles from '@mui/styles/withStyles';
+import withTheme from '@mui/styles/withTheme';
 import ListItem from '@mui/material/ListItem';
 import ListItemIcon from '@mui/material/ListItemIcon';
 import ListItemText from '@mui/material/ListItemText';
@@ -13,7 +14,7 @@ import { AutoFix } from 'mdi-material-ui';
 import Skeleton from '@mui/material/Skeleton';
 import Tooltip from '@mui/material/Tooltip';
 import * as R from 'ramda';
-import { DraftChip } from '../draft/DraftChip';
+import { DraftChip, getDraftModeColor } from '../draft/DraftChip';
 import inject18n from '../../../../components/i18n';
 import ItemConfidence from '../../../../components/ItemConfidence';
 import StixCoreRelationshipPopover from './StixCoreRelationshipPopover';
@@ -56,6 +57,7 @@ class SimpleStixObjectOrStixRelationshipStixCoreRelationshipLineComponent extend
       fsd,
       t,
       classes,
+      theme,
       dataColumns,
       node,
       paginationOptions,
@@ -72,6 +74,7 @@ class SimpleStixObjectOrStixRelationshipStixCoreRelationshipLineComponent extend
       name: 'Restricted',
       restricted: true,
     };
+    const draftColor = getDraftModeColor(theme);
     return (
       <ListItem
         classes={{ root: classes.item }}
@@ -81,7 +84,7 @@ class SimpleStixObjectOrStixRelationshipStixCoreRelationshipLineComponent extend
         to={link}
       >
         <ListItemIcon classes={{ root: classes.itemIcon }}>
-          <ItemIcon type={node.entity_type} isReversed={isReversed} />
+          <ItemIcon type={node.entity_type} isReversed={isReversed} color={node.draftVersion ? draftColor : null} />
         </ListItemIcon>
         <ListItemText
           primary={
@@ -183,6 +186,10 @@ const SimpleStixObjectOrStixRelationshipStixCoreRelationshipLineFragment = creat
     node: graphql`
         fragment SimpleStixObjectOrStixRelationshipStixCoreRelationshipLine_node on StixCoreRelationship {
           id
+          draftVersion {
+            draft_id
+            draft_operation
+          }
           entity_type
           parent_types
           relationship_type
@@ -684,6 +691,7 @@ const SimpleStixObjectOrStixRelationshipStixCoreRelationshipLineFragment = creat
 export const SimpleStixObjectOrStixRelationshipStixCoreRelationshipLine = compose(
   inject18n,
   withStyles(styles),
+  withTheme,
 )(SimpleStixObjectOrStixRelationshipStixCoreRelationshipLineFragment);
 
 class SimpleStixObjectOrStixRelationshipStixCoreRelationshipLineDummyComponent extends Component {