Skip to content

Commit 3a7a7c3

Browse files
SarahBocognanoSarahBocognano
committed
[frontend] Impossible to share Note with Organization (#10030)
1 parent 5ea077b commit 3a7a7c3

File tree

14 files changed

+66
-50
lines changed

14 files changed

+66
-50
lines changed

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

+4
Original file line numberDiff line numberDiff line change
@@ -2556,10 +2556,13 @@
25562556
"Request Access": "Antrag auf Zugang",
25572557
"Request access action configuration": "Beantragung der Zugriffsaktion Konfiguration",
25582558
"Request Access Configuration": "Zugang beantragen Konfiguration",
2559+
"Request access configuration successfully updated": "Antrag auf Zugangskonfiguration erfolgreich aktualisiert",
25592560
"Request Access for entity": "Zugang beantragen für Entität",
25602561
"Request access workflow": "Zugriffsworkflow beantragen",
25612562
"Request For Information Date": "Datum der Informationsanforderung",
25622563
"Request for Information date": "Datum des Auskunftsersuchens",
2564+
"Request for information status to use when access request is accepted.": "Antrag auf Informationsstatus, der zu verwenden ist, wenn die Zugangsanfrage akzeptiert wird.",
2565+
"Request for information status to use when access request is declined.": "Antrag auf Informationsstatus für die Ablehnung des Antrags auf Zugang.",
25632566
"Request for information type": "Anfrage nach Informationen Typ",
25642567
"Request For Takedown Date": "Antrag auf Takedown Datum",
25652568
"Request for Takedown date": "Request for Takedown Datum",
@@ -3382,6 +3385,7 @@
33823385
"Windows services": "Windows-Dienste",
33833386
"WITH": "MIT",
33843387
"with the value": "mit dem Wert",
3388+
"Worflow": "Arbeitsablauf",
33853389
"Work end time": "Endzeit der Arbeit",
33863390
"Work start time": "Startzeit der Arbeit",
33873391
"Workbench": "Werkbank",

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

+4
Original file line numberDiff line numberDiff line change
@@ -2556,10 +2556,13 @@
25562556
"Request Access": "Request Access",
25572557
"Request access action configuration": "Request access action configuration",
25582558
"Request Access Configuration": "Request Access Configuration",
2559+
"Request access configuration successfully updated": "Request access configuration successfully updated",
25592560
"Request Access for entity": "Request Access for entity",
25602561
"Request access workflow": "Request access workflow",
25612562
"Request For Information Date": "Request For Information Date",
25622563
"Request for Information date": "Request for Information date",
2564+
"Request for information status to use when access request is accepted.": "Request for information status to use when access request is accepted.",
2565+
"Request for information status to use when access request is declined.": "Request for information status to use when access request is declined.",
25632566
"Request for information type": "Request for information type",
25642567
"Request For Takedown Date": "Request For Takedown Date",
25652568
"Request for Takedown date": "Request for Takedown date",
@@ -3382,6 +3385,7 @@
33823385
"Windows services": "Windows services",
33833386
"WITH": "WITH",
33843387
"with the value": "with the value",
3388+
"Worflow": "Worflow",
33853389
"Work end time": "Work end time",
33863390
"Work start time": "Work start time",
33873391
"Workbench": "Workbench",

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

+4
Original file line numberDiff line numberDiff line change
@@ -2556,10 +2556,13 @@
25562556
"Request Access": "Solicitar acceso",
25572557
"Request access action configuration": "Solicitar configuración de acción de acceso",
25582558
"Request Access Configuration": "Solicitar configuración de acceso",
2559+
"Request access configuration successfully updated": "Solicitud de configuración de acceso actualizada correctamente",
25592560
"Request Access for entity": "Solicitar acceso para entidad",
25602561
"Request access workflow": "Solicitar flujo de trabajo de acceso",
25612562
"Request For Information Date": "Solicitud de Información Fecha",
25622563
"Request for Information date": "Fecha de solicitud de información",
2564+
"Request for information status to use when access request is accepted.": "Estado de la solicitud de información a utilizar cuando se acepta la solicitud de acceso.",
2565+
"Request for information status to use when access request is declined.": "Estado de la solicitud de información que se utilizará cuando se rechace la solicitud de acceso.",
25632566
"Request for information type": "Tipo de solicitud de información",
25642567
"Request For Takedown Date": "Solicitud de fecha de eliminación",
25652568
"Request for Takedown date": "Solicitud de fecha de eliminación",
@@ -3382,6 +3385,7 @@
33823385
"Windows services": "Servicios de Windows",
33833386
"WITH": "CON",
33843387
"with the value": "con el valor",
3388+
"Worflow": "Flujo de trabajo",
33853389
"Work end time": "Hora de fin de la ejecución",
33863390
"Work start time": "Hora de inicio de la ejecución",
33873391
"Workbench": "Banco de trabajo",

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

+4
Original file line numberDiff line numberDiff line change
@@ -2556,10 +2556,13 @@
25562556
"Request Access": "Demande d'accès",
25572557
"Request access action configuration": "Demande d'accès à la configuration de l'action",
25582558
"Request Access Configuration": "Demande de configuration d'accès",
2559+
"Request access configuration successfully updated": "Demande de configuration d'accès mise à jour avec succès",
25592560
"Request Access for entity": "Demande d'accès pour l'entité",
25602561
"Request access workflow": "Demande d'accès au flux de travail",
25612562
"Request For Information Date": "Date de la demande d'informations",
25622563
"Request for Information date": "Date de la demande d'information",
2564+
"Request for information status to use when access request is accepted.": "Statut de la demande d'information à utiliser lorsque la demande d'accès est acceptée.",
2565+
"Request for information status to use when access request is declined.": "Statut de la demande d'information à utiliser lorsque la demande d'accès est refusée.",
25632566
"Request for information type": "Type de demande d'informations",
25642567
"Request For Takedown Date": "Date de la demande de Retrait",
25652568
"Request for Takedown date": "Date de la demande de retrait",
@@ -3382,6 +3385,7 @@
33823385
"Windows services": "Services Windows",
33833386
"WITH": "AVEC",
33843387
"with the value": "avec la valeur",
3388+
"Worflow": "Flux de travail",
33853389
"Work end time": "Fin de l'éxécution",
33863390
"Work start time": "Début de l'exécution",
33873391
"Workbench": "Espace de travail",

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

+4
Original file line numberDiff line numberDiff line change
@@ -2556,10 +2556,13 @@
25562556
"Request Access": "アクセス要求",
25572557
"Request access action configuration": "リクエスト・アクセス・アクションの設定",
25582558
"Request Access Configuration": "リクエスト・アクセス設定",
2559+
"Request access configuration successfully updated": "リクエストのアクセス設定が正常に更新されました",
25592560
"Request Access for entity": "リクエスト・アクセス・エンティティ",
25602561
"Request access workflow": "リクエスト・アクセス・ワークフロー",
25612562
"Request For Information Date": "資料請求日",
25622563
"Request for Information date": "資料請求日",
2564+
"Request for information status to use when access request is accepted.": "アクセス要求が受理された場合に使用する情報要求ステータス",
2565+
"Request for information status to use when access request is declined.": "アクセス要求が拒否された場合に使用する情報ステータスの要求。",
25632566
"Request for information type": "資料請求タイプ",
25642567
"Request For Takedown Date": "削除日のリクエスト",
25652568
"Request for Takedown date": "削除依頼日",
@@ -3382,6 +3385,7 @@
33823385
"Windows services": "Windowsサービス",
33833386
"WITH": "WITH",
33843387
"with the value": "値",
3388+
"Worflow": "ワーフロー",
33853389
"Work end time": "作業終了時刻",
33863390
"Work start time": "作業開始時刻",
33873391
"Workbench": "ワークベンチ",

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

+4
Original file line numberDiff line numberDiff line change
@@ -2556,10 +2556,13 @@
25562556
"Request Access": "액세스 요청",
25572557
"Request access action configuration": "요청 액세스 작업 구성",
25582558
"Request Access Configuration": "액세스 구성 요청",
2559+
"Request access configuration successfully updated": "요청 액세스 구성이 성공적으로 업데이트되었습니다",
25592560
"Request Access for entity": "엔티티에 대한 액세스 요청",
25602561
"Request access workflow": "액세스 요청 워크플로",
25612562
"Request For Information Date": "정보 요청 날짜",
25622563
"Request for Information date": "정보 요청 날짜",
2564+
"Request for information status to use when access request is accepted.": "액세스 요청이 수락될 때 사용할 정보 상태를 요청합니다.",
2565+
"Request for information status to use when access request is declined.": "액세스 요청이 거부될 때 사용할 정보 상태를 요청했습니다.",
25632566
"Request for information type": "정보 요청 유형",
25642567
"Request For Takedown Date": "삭제 요청 날짜",
25652568
"Request for Takedown date": "삭제 요청 날짜",
@@ -3382,6 +3385,7 @@
33823385
"Windows services": "Windows 서비스",
33833386
"WITH": "WITH",
33843387
"with the value": "값과 함께",
3388+
"Worflow": "Worflow",
33853389
"Work end time": "작업 종료 시간",
33863390
"Work start time": "작업 시작 시간",
33873391
"Workbench": "워크벤치",

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

+4
Original file line numberDiff line numberDiff line change
@@ -2556,10 +2556,13 @@
25562556
"Request Access": "请求访问",
25572557
"Request access action configuration": "请求访问行动配置",
25582558
"Request Access Configuration": "请求访问配置",
2559+
"Request access configuration successfully updated": "请求成功更新访问配置",
25592560
"Request Access for entity": "请求访问实体",
25602561
"Request access workflow": "请求访问工作流程",
25612562
"Request For Information Date": "请求资料日期",
25622563
"Request for Information date": "索取资料日期",
2564+
"Request for information status to use when access request is accepted.": "请求在访问请求被接受时使用的信息状态。",
2565+
"Request for information status to use when access request is declined.": "请求在访问请求被拒绝时使用的信息状态。",
25632566
"Request for information type": "请求信息类型",
25642567
"Request For Takedown Date": "请求删除日期",
25652568
"Request for Takedown date": "请求删除日期",
@@ -3382,6 +3385,7 @@
33823385
"Windows services": "Windows服务",
33833386
"WITH": "有",
33843387
"with the value": "与值",
3388+
"Worflow": "工作流程",
33853389
"Work end time": "工作结束时间",
33863390
"Work start time": "工作开始时间",
33873391
"Workbench": "工作台",

‎opencti-platform/opencti-front/src/components/RequestAccessDialog.tsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import Transition from './Transition';
1515
import { RequestAccessDialogMutation$variables } from './__generated__/RequestAccessDialogMutation.graphql';
1616
import { handleErrorInForm } from '../relay/environment';
1717
import useAuth from '../utils/hooks/useAuth';
18+
import { fieldSpacingContainerStyle } from '../utils/field';
1819

1920
const requestAccessDialogMutation = graphql`
2021
mutation RequestAccessDialogMutation($input: RequestAccessAddInput!) {
@@ -88,7 +89,7 @@ const RequestAccessDialog: React.FC<RequestAccessDialogProps> = ({ open, onClose
8889
onClose={onClose}
8990
>
9091
<DialogContent>
91-
<DialogTitle style={{ padding: '16px 0' }}>{t_i18n('Request Access for entity')}</DialogTitle>
92+
<DialogTitle style={{ padding: '16px 0' }}>{t_i18n('Request Access')}</DialogTitle>
9293
<Formik
9394
initialValues={initialValues}
9495
onSubmit={onSubmit}
@@ -108,14 +109,14 @@ const RequestAccessDialog: React.FC<RequestAccessDialogProps> = ({ open, onClose
108109
label={t_i18n('Enter justification for requesting this entity')}
109110
fullWidth={true}
110111
variant="standard"
111-
style={{ marginTop: 20 }}
112+
style={fieldSpacingContainerStyle}
112113
askAi={true}
113114
multiline={true}
114115
minRows={5}
115116
/>
116117
<ObjectOrganizationField
117118
name="organizations"
118-
style={{ width: '100%', paddingTop: '16px', marginBottom: 20 }}
119+
style={fieldSpacingContainerStyle}
119120
label={t_i18n('Select the organization of your choice for requesting this entity')}
120121
multiple={false}
121122
alert={false}

‎opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiDetails.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const useStyles = makeStyles<Theme>((theme) => ({
3535
},
3636
}));
3737

38-
export const CaseRfiDetailsFragment = graphql`
38+
const CaseRfiDetailsFragment = graphql`
3939
fragment CaseRfiDetails_case on CaseRfi {
4040
id
4141
name

‎opencti-platform/opencti-front/src/private/components/common/form/StatusTemplateField.tsx

-6
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ export const StatusTemplateFieldQuery = graphql`
5151
}
5252
`;
5353

54-
export interface StatusTemplateFieldData {
55-
label: string | undefined;
56-
value: string | undefined;
57-
color: string | undefined;
58-
}
59-
6054
const StatusTemplateField: FunctionComponent<StatusTemplateFieldProps> = ({
6155
name,
6256
style,

‎opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectOverview.jsx

-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ const StixDomainObjectOverview = ({
180180
isRequestAccessNew = currentActionStatus && currentActionStatus.actionStatus === 'NEW';
181181
acceptButtonColor = requestAccess.acceptColor ?? '#555';
182182
declineButtonColor = requestAccess.declineColor ?? '#555';
183-
console.log(`acceptButtonColor${acceptButtonColor}`);
184183
}
185184

186185
const onSubmitValidateRequestAccess = () => {

‎opencti-platform/opencti-front/src/private/components/settings/sub_types/SubType.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ const SubTypeComponent: React.FC<SubTypeProps> = ({ queryRef }) => {
8989

9090
const hasTemplates = subType.settings?.availableSettings.includes('templates');
9191

92+
const hasRequestAccessConfig = subType.settings?.requestAccessConfiguration && isRequestAccessFeatureEnabled && subType.settings?.availableSettings.includes('request_access_workflow');
93+
9294
const paperStyle: CSSProperties = {
9395
marginTop: theme.spacing(1),
9496
padding: theme.spacing(2),
@@ -140,7 +142,7 @@ const SubTypeComponent: React.FC<SubTypeProps> = ({ queryRef }) => {
140142
{subType.settings?.availableSettings.includes('workflow_configuration')
141143
&& <GlobalWorkflowSettings data={subType} subTypeId={subType.id} workflowEnabled={subType.workflowEnabled ?? false}/>
142144
}
143-
{subType.settings?.requestAccessConfiguration && isRequestAccessFeatureEnabled && subType.settings?.availableSettings.includes('request_access_workflow')
145+
{hasRequestAccessConfig
144146
&& <RequestAccessSettings data={subType} subTypeId={subType.id} dataConfiguration={subType.settings.requestAccessConfiguration}/>
145147
}
146148
</Paper>

‎opencti-platform/opencti-front/src/private/components/settings/sub_types/workflow/RequestAccessConfigurationEdition.tsx

+28-28
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { graphql, useFragment } from 'react-relay';
22
import React, { FunctionComponent } from 'react';
33
import Drawer from '@components/common/drawer/Drawer';
44
import { Form, Formik } from 'formik';
5-
import { StatusTemplateFieldData } from '@components/common/form/StatusTemplateField';
65
import Button from '@mui/material/Button';
76
import { FormikConfig } from 'formik/dist/types';
87
import StatusTemplateFieldScoped from '@components/settings/sub_types/workflow/StatusTemplateFieldScoped';
98
import GroupField, { GroupFieldOption } from '@components/common/form/GroupField';
9+
import { Option } from '@components/common/form/ReferenceField';
1010
import { useFormatter } from '../../../../../components/i18n';
1111
import useApiMutation from '../../../../../utils/hooks/useApiMutation';
1212
import { handleErrorInForm } from '../../../../../relay/environment';
@@ -24,27 +24,27 @@ const requestAccessConfigurationMutation = graphql`
2424

2525
export const requestAccessConfigurationFragment = graphql`
2626
fragment RequestAccessConfigurationEdition_requestAccess on RequestAccessConfiguration {
27+
id
28+
approved_status {
29+
id
30+
template {
2731
id
28-
approved_status {
29-
id
30-
template {
31-
id
32-
color
33-
name
34-
}
35-
}
36-
declined_status {
37-
id
38-
template {
39-
id
40-
color
41-
name
42-
}
43-
}
44-
approval_admin {
45-
id
46-
name
47-
}
32+
color
33+
name
34+
}
35+
}
36+
declined_status {
37+
id
38+
template {
39+
id
40+
color
41+
name
42+
}
43+
}
44+
approval_admin {
45+
id
46+
name
47+
}
4848
}
4949
`;
5050

@@ -55,8 +55,8 @@ interface RequestAccessWorkflowProps {
5555
}
5656

5757
interface RequestAccessEditionFormInputs {
58-
acceptedTemplate: StatusTemplateFieldData
59-
declinedTemplate: StatusTemplateFieldData
58+
acceptedTemplate: Option
59+
declinedTemplate: Option
6060
approvalAdmin: GroupFieldOption
6161
}
6262

@@ -90,16 +90,16 @@ const RequestAccessConfigurationEdition: FunctionComponent<RequestAccessWorkflow
9090
const [commit] = useApiMutation<RequestAccessConfigurationEditionMutation>(
9191
requestAccessConfigurationMutation,
9292
undefined,
93-
{ successMessage: `Request access configuration ${t_i18n('successfully updated')}` },
93+
{ successMessage: `${t_i18n('Request access configuration successfully updated')}` },
9494
);
9595

9696
const onSubmit: FormikConfig<RequestAccessEditionFormInputs>['onSubmit'] = (
9797
values,
9898
{ setSubmitting, setErrors, resetForm },
9999
) => {
100100
const input: RequestAccessConfigureInput = {
101-
approved_status_id: values.acceptedTemplate.value || '', // FIXME remove || ''
102-
declined_status_id: values.declinedTemplate.value || '', // FIXME remove || ''
101+
approved_status_id: values.acceptedTemplate.value,
102+
declined_status_id: values.declinedTemplate.value,
103103
approval_admin: [values.approvalAdmin.value],
104104
};
105105
commit({
@@ -137,15 +137,15 @@ const RequestAccessConfigurationEdition: FunctionComponent<RequestAccessWorkflow
137137
<StatusTemplateFieldScoped
138138
name="acceptedTemplate"
139139
setFieldValue={setFieldValue}
140-
helpertext={'Request for information status to use when access request is accepted.'}
140+
helpertext={t_i18n('Request for information status to use when access request is accepted.')}
141141
required={true}
142142
style={fieldSpacingContainerStyle}
143143
scope='REQUEST_ACCESS'
144144
/>
145145
<StatusTemplateFieldScoped
146146
name="declinedTemplate"
147147
setFieldValue={setFieldValue}
148-
helpertext={'Request for information status to use when access request is declined.'}
148+
helpertext={t_i18n('Request for information status to use when access request is declined.')}
149149
required={true}
150150
style={fieldSpacingContainerStyle}
151151
scope='REQUEST_ACCESS'

‎opencti-platform/opencti-front/src/private/components/settings/sub_types/workflow/StatusTemplateFieldScoped.tsx

+2-10
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ export const StatusTemplateFieldScopedSearchQuery = graphql`
2828
}
2929
`;
3030

31-
export interface StatusTemplateFieldData {
32-
label: string | undefined;
33-
value: string | undefined;
34-
color: string | undefined;
35-
}
36-
3731
const StatusTemplateFieldScoped: FunctionComponent<StatusTemplateFieldScopedProps> = ({
3832
name,
3933
style,
@@ -42,9 +36,7 @@ const StatusTemplateFieldScoped: FunctionComponent<StatusTemplateFieldScopedProp
4236
scope,
4337
}) => {
4438
const { t_i18n } = useFormatter();
45-
46-
// const [statusTemplateInput, setStatusTemplateInput] = useState<string>('');
47-
const [statusTemplates, setStatusTemplates] = useState<StatusTemplateFieldData[]>([]);
39+
const [statusTemplates, setStatusTemplates] = useState<Option[]>([]);
4840

4941
const searchStatusTemplates = (
5042
event: React.ChangeEvent<HTMLInputElement>,
@@ -56,7 +48,7 @@ const StatusTemplateFieldScoped: FunctionComponent<StatusTemplateFieldScopedProp
5648
.toPromise()
5749
.then((data) => {
5850
const queryData: StatusTemplateFieldScopedSearchQuery$data = data as unknown as StatusTemplateFieldScopedSearchQuery$data;
59-
const fieldData: StatusTemplateFieldData[] = queryData?.statusTemplatesByStatusScope?.map((statusData) => {
51+
const fieldData: Option[] = queryData?.statusTemplatesByStatusScope?.map((statusData: Option) => {
6052
return { label: statusData?.name, value: statusData?.id, color: statusData?.color };
6153
}) || [];
6254
setStatusTemplates(fieldData);

0 commit comments

Comments
 (0)