Skip to content

Commit 2c14d7a

Browse files
authored
delete criteria filter (#575)
* delete criteria filter Signed-off-by: basseche <[email protected]>
1 parent 8661928 commit 2c14d7a

File tree

4 files changed

+2
-36
lines changed

4 files changed

+2
-36
lines changed

src/components/directory-content.tsx

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { useDispatch, useSelector } from 'react-redux';
1010
import { FormattedMessage, useIntl } from 'react-intl';
1111
import { Box, Button, CircularProgress, Grid, SxProps, Theme } from '@mui/material';
1212
import {
13-
CriteriaBasedFilterEditionDialog,
1413
DescriptionModificationDialog,
1514
ElementAttributes,
1615
ElementType,
@@ -153,15 +152,6 @@ export default function DirectoryContent() {
153152
setElementName('');
154153
};
155154

156-
/** Filters dialog: window status value to edit CriteriaBased filters */
157-
const [currentCriteriaBasedFilterId, setCurrentCriteriaBasedFilterId] = useState(null);
158-
const handleCloseCriteriaBasedFilterDialog = () => {
159-
setOpenDialog(constants.DialogsId.NONE);
160-
setCurrentCriteriaBasedFilterId(null);
161-
setActiveElement(null);
162-
setElementName('');
163-
};
164-
165155
const [currentExplicitNamingFilterId, setCurrentExplicitNamingFilterId] = useState(null);
166156
/** Filters dialog: window status value to edit ExplicitNaming filters */
167157
const handleCloseExplicitNamingFilterDialog = () => {
@@ -365,9 +355,6 @@ export default function DirectoryContent() {
365355
if (subtype === FilterType.EXPLICIT_NAMING.id) {
366356
setCurrentExplicitNamingFilterId(event.data.elementUuid);
367357
setOpenDialog(subtype);
368-
} else if (subtype === FilterType.CRITERIA_BASED.id) {
369-
setCurrentCriteriaBasedFilterId(event.data.elementUuid);
370-
setOpenDialog(subtype);
371358
} else if (subtype === FilterType.EXPERT.id) {
372359
setCurrentExpertFilterId(event.data.elementUuid);
373360
setOpenDialog(subtype);
@@ -552,24 +539,6 @@ export default function DirectoryContent() {
552539
language={languageLocal}
553540
/>
554541
);
555-
case FilterType.CRITERIA_BASED.id:
556-
return (
557-
<CriteriaBasedFilterEditionDialog
558-
// @ts-expect-error TODO: manage null case(s) here
559-
id={currentCriteriaBasedFilterId}
560-
open
561-
onClose={handleCloseCriteriaBasedFilterDialog}
562-
titleId="editFilter"
563-
name={name}
564-
broadcastChannel={broadcastChannel}
565-
getFilterById={getFilterById}
566-
selectionForCopy={selectionForCopy}
567-
setSelectionForCopy={setItemSelectionForCopy}
568-
activeDirectory={activeDirectory}
569-
elementExists={elementExists}
570-
language={languageLocal}
571-
/>
572-
);
573542
case FilterType.EXPERT.id:
574543
return (
575544
<ExpertFilterEditionDialog

src/translations/external/backend-locale-en.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ const BackendLocaleEn = {
1414
MATPOWER: 'MATPOWER',
1515
POWERFACTORY: 'POWERFACTORY',
1616
'IEEE CDF': 'IEEE CDF',
17-
EXPERT_FILTER: 'Filter (Expert)',
17+
EXPERT_FILTER: 'Filter (Criteria based)',
1818
FORM_FILTER: 'Filter (Form)',
1919
IDENTIFIERS_CONTINGENCY_LIST: 'Contingency list (Explicit naming)',
2020
FORM_CONTINGENCY_LIST: 'Contingency list (Criteria based)',
2121
SCRIPT_FILTER: 'Filter (Script)',
2222
SCRIPT_CONTINGENCY_LIST: 'Contingency list (Script)',
2323
IDENTIFIER_LIST_FILTER: 'Filter (Explicit naming)',
24-
CRITERIA_FILTER: 'Filter (Criteria based)',
2524

2625
// spreadsheet config metadata
2726
Load: 'Load',

src/translations/external/backend-locale-fr.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ const BackendLocaleFr = {
1414
MATPOWER: 'MATPOWER',
1515
POWERFACTORY: 'POWERFACTORY',
1616
'IEEE CDF': 'IEEE CDF',
17-
EXPERT_FILTER: 'Filtre (Expert)',
17+
EXPERT_FILTER: 'Filtre (Par critères)',
1818
FORM_FILTER: 'Filtre (Formulaire)',
1919
IDENTIFIERS_CONTINGENCY_LIST: "Liste d'aléas (Par nommage)",
2020
FORM_CONTINGENCY_LIST: "Liste d'aléas (Par critères)",
2121
SCRIPT_FILTER: 'Filtre (Script)',
2222
SCRIPT_CONTINGENCY_LIST: "Liste d'aléas (Script)",
2323
IDENTIFIER_LIST_FILTER: 'Filtre (Par nommage)',
24-
CRITERIA_FILTER: 'Filtre (Par critères)',
2524

2625
// spreadsheet config metadata
2726
Load: 'Consommation',

src/utils/elementType.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77

88
export const FilterType = {
9-
CRITERIA_BASED: { id: 'CRITERIA', label: 'filter.criteriaBased' },
109
EXPLICIT_NAMING: { id: 'IDENTIFIER_LIST', label: 'filter.explicitNaming' },
1110
EXPERT: { id: 'EXPERT', label: 'filter.expert' },
1211
};

0 commit comments

Comments
 (0)