@gridsuite/commons-ui 0.77.0 → 0.77.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/filter/expert/expertFilterConstants.js +8 -8
- package/dist/components/filter/expert/expertFilterUtils.js +0 -3
- package/dist/components/inputs/reactHookForm/text/UniqueNameInput.js +3 -1
- package/dist/components/inputs/reactQueryBuilder/RemoveButton.js +2 -3
- package/dist/components/inputs/reactQueryBuilder/ValueEditor.js +2 -2
- package/dist/utils/types/fieldType.d.ts +8 -9
- package/dist/utils/types/fieldType.js +8 -9
- package/package.json +1 -1
|
@@ -804,56 +804,56 @@ const FIELDS_OPTIONS = {
|
|
|
804
804
|
inputType: "number"
|
|
805
805
|
},
|
|
806
806
|
PROPERTY: {
|
|
807
|
-
name: FieldType.
|
|
807
|
+
name: FieldType.FREE_PROPERTIES,
|
|
808
808
|
label: "property",
|
|
809
809
|
dataType: DataType.PROPERTY,
|
|
810
810
|
valueEditorType: "select",
|
|
811
811
|
defaultValue: ""
|
|
812
812
|
},
|
|
813
813
|
SUBSTATION_PROPERTY: {
|
|
814
|
-
name: FieldType.
|
|
814
|
+
name: FieldType.SUBSTATION_PROPERTIES,
|
|
815
815
|
label: "substationProperty",
|
|
816
816
|
dataType: DataType.PROPERTY,
|
|
817
817
|
valueEditorType: "select",
|
|
818
818
|
defaultValue: ""
|
|
819
819
|
},
|
|
820
820
|
SUBSTATION_PROPERTY_1: {
|
|
821
|
-
name: FieldType.
|
|
821
|
+
name: FieldType.SUBSTATION_PROPERTIES_1,
|
|
822
822
|
label: "substationProperty1",
|
|
823
823
|
dataType: DataType.PROPERTY,
|
|
824
824
|
valueEditorType: "select",
|
|
825
825
|
defaultValue: ""
|
|
826
826
|
},
|
|
827
827
|
SUBSTATION_PROPERTY_2: {
|
|
828
|
-
name: FieldType.
|
|
828
|
+
name: FieldType.SUBSTATION_PROPERTIES_2,
|
|
829
829
|
label: "substationProperty2",
|
|
830
830
|
dataType: DataType.PROPERTY,
|
|
831
831
|
valueEditorType: "select",
|
|
832
832
|
defaultValue: ""
|
|
833
833
|
},
|
|
834
834
|
VOLTAGE_LEVEL_PROPERTY: {
|
|
835
|
-
name: FieldType.
|
|
835
|
+
name: FieldType.VOLTAGE_LEVEL_PROPERTIES,
|
|
836
836
|
label: "voltageLevelProperty",
|
|
837
837
|
dataType: DataType.PROPERTY,
|
|
838
838
|
valueEditorType: "select",
|
|
839
839
|
defaultValue: ""
|
|
840
840
|
},
|
|
841
841
|
VOLTAGE_LEVEL_PROPERTY_1: {
|
|
842
|
-
name: FieldType.
|
|
842
|
+
name: FieldType.VOLTAGE_LEVEL_PROPERTIES_1,
|
|
843
843
|
label: "voltageLevelProperty1",
|
|
844
844
|
dataType: DataType.PROPERTY,
|
|
845
845
|
valueEditorType: "select",
|
|
846
846
|
defaultValue: ""
|
|
847
847
|
},
|
|
848
848
|
VOLTAGE_LEVEL_PROPERTY_2: {
|
|
849
|
-
name: FieldType.
|
|
849
|
+
name: FieldType.VOLTAGE_LEVEL_PROPERTIES_2,
|
|
850
850
|
label: "voltageLevelProperty2",
|
|
851
851
|
dataType: DataType.PROPERTY,
|
|
852
852
|
valueEditorType: "select",
|
|
853
853
|
defaultValue: ""
|
|
854
854
|
},
|
|
855
855
|
VOLTAGE_LEVEL_PROPERTY_3: {
|
|
856
|
-
name: FieldType.
|
|
856
|
+
name: FieldType.VOLTAGE_LEVEL_PROPERTIES_3,
|
|
857
857
|
label: "voltageLevelProperty3Twt",
|
|
858
858
|
dataType: DataType.PROPERTY,
|
|
859
859
|
valueEditorType: "select",
|
|
@@ -326,9 +326,6 @@ const queryValidator = (query) => {
|
|
|
326
326
|
};
|
|
327
327
|
const validateGroup = (ruleGroup) => {
|
|
328
328
|
const reasons = [];
|
|
329
|
-
if (ruleGroup.rules.length === 0) {
|
|
330
|
-
reasons.push(RULES.EMPTY_GROUP);
|
|
331
|
-
}
|
|
332
329
|
if (ruleGroup.id) {
|
|
333
330
|
if (reasons.length) {
|
|
334
331
|
result[ruleGroup.id] = { valid: false, reasons };
|
|
@@ -33,6 +33,7 @@ function UniqueNameInput({
|
|
|
33
33
|
const {
|
|
34
34
|
setError,
|
|
35
35
|
clearErrors,
|
|
36
|
+
trigger,
|
|
36
37
|
formState: { errors }
|
|
37
38
|
} = useFormContext();
|
|
38
39
|
const isValidating = (_a = errors.root) == null ? void 0 : _a.isValidating;
|
|
@@ -55,10 +56,11 @@ function UniqueNameInput({
|
|
|
55
56
|
console.error(e == null ? void 0 : e.message);
|
|
56
57
|
}).finally(() => {
|
|
57
58
|
clearErrors("root.isValidating");
|
|
59
|
+
trigger("root.isValidating");
|
|
58
60
|
});
|
|
59
61
|
}
|
|
60
62
|
},
|
|
61
|
-
[setError, clearErrors, name, elementType, elementExists, directory]
|
|
63
|
+
[setError, clearErrors, name, elementType, elementExists, directory, trigger]
|
|
62
64
|
);
|
|
63
65
|
const debouncedHandleCheckName = useDebounce(handleCheckName, 700);
|
|
64
66
|
useEffect(() => {
|
|
@@ -2,7 +2,7 @@ import { jsx } from "react/jsx-runtime";
|
|
|
2
2
|
import IconButton from "@mui/material/IconButton";
|
|
3
3
|
import DeleteIcon from "@mui/icons-material/Delete";
|
|
4
4
|
import { useController } from "react-hook-form";
|
|
5
|
-
import {
|
|
5
|
+
import { recursiveRemove } from "../../filter/expert/expertFilterUtils.js";
|
|
6
6
|
const EXPERT_FILTER_QUERY = "rules";
|
|
7
7
|
function RemoveButton(props) {
|
|
8
8
|
const { path, className, title } = props;
|
|
@@ -12,8 +12,7 @@ function RemoveButton(props) {
|
|
|
12
12
|
function handleDelete() {
|
|
13
13
|
onChange(recursiveRemove(query, path));
|
|
14
14
|
}
|
|
15
|
-
|
|
16
|
-
return /* @__PURE__ */ jsx(IconButton, { size: "small", onClick: () => handleDelete(), className, title, children: !isLastRuleOrGroup && /* @__PURE__ */ jsx(DeleteIcon, {}) });
|
|
15
|
+
return /* @__PURE__ */ jsx(IconButton, { size: "small", onClick: () => handleDelete(), className, title, children: /* @__PURE__ */ jsx(DeleteIcon, {}) });
|
|
17
16
|
}
|
|
18
17
|
export {
|
|
19
18
|
RemoveButton
|
|
@@ -81,9 +81,9 @@ function ValueEditor(props) {
|
|
|
81
81
|
}
|
|
82
82
|
if (fieldData.dataType === DataType.PROPERTY) {
|
|
83
83
|
let equipmentType;
|
|
84
|
-
if (field === FieldType.
|
|
84
|
+
if (field === FieldType.SUBSTATION_PROPERTIES || field === FieldType.SUBSTATION_PROPERTIES_1 || field === FieldType.SUBSTATION_PROPERTIES_2) {
|
|
85
85
|
equipmentType = Substation.type;
|
|
86
|
-
} else if (field === FieldType.
|
|
86
|
+
} else if (field === FieldType.VOLTAGE_LEVEL_PROPERTIES || field === FieldType.VOLTAGE_LEVEL_PROPERTIES_1 || field === FieldType.VOLTAGE_LEVEL_PROPERTIES_2 || field === FieldType.VOLTAGE_LEVEL_PROPERTIES_3) {
|
|
87
87
|
equipmentType = VoltageLevel.type;
|
|
88
88
|
} else {
|
|
89
89
|
equipmentType = getValues(FieldConstants.EQUIPMENT_TYPE);
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
export declare enum FieldType {
|
|
8
8
|
ID = "ID",
|
|
9
9
|
NAME = "NAME",
|
|
10
|
-
|
|
10
|
+
FREE_PROPERTIES = "FREE_PROPERTIES",
|
|
11
11
|
NOMINAL_VOLTAGE = "NOMINAL_VOLTAGE",
|
|
12
12
|
MIN_P = "MIN_P",
|
|
13
13
|
MAX_P = "MAX_P",
|
|
@@ -107,14 +107,13 @@ export declare enum FieldType {
|
|
|
107
107
|
PHASE_REGULATION_VALUE_1 = "PHASE_REGULATION_VALUE_1",
|
|
108
108
|
PHASE_REGULATION_VALUE_2 = "PHASE_REGULATION_VALUE_2",
|
|
109
109
|
PHASE_REGULATION_VALUE_3 = "PHASE_REGULATION_VALUE_3",
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
VOLTAGE_LEVEL_PROPERTY_3 = "VOLTAGE_LEVEL_PROPERTY_3",
|
|
110
|
+
SUBSTATION_PROPERTIES = "SUBSTATION_PROPERTIES",
|
|
111
|
+
SUBSTATION_PROPERTIES_1 = "SUBSTATION_PROPERTIES_1",
|
|
112
|
+
SUBSTATION_PROPERTIES_2 = "SUBSTATION_PROPERTIES_2",
|
|
113
|
+
VOLTAGE_LEVEL_PROPERTIES = "VOLTAGE_LEVEL_PROPERTIES",
|
|
114
|
+
VOLTAGE_LEVEL_PROPERTIES_1 = "VOLTAGE_LEVEL_PROPERTIES_1",
|
|
115
|
+
VOLTAGE_LEVEL_PROPERTIES_2 = "VOLTAGE_LEVEL_PROPERTIES_2",
|
|
116
|
+
VOLTAGE_LEVEL_PROPERTIES_3 = "VOLTAGE_LEVEL_PROPERTIES_3",
|
|
118
117
|
SVAR_REGULATION_MODE = "SVAR_REGULATION_MODE",
|
|
119
118
|
VOLTAGE_SET_POINT = "VOLTAGE_SET_POINT",
|
|
120
119
|
ACTIVE_POWER_SET_POINT = "ACTIVE_POWER_SET_POINT",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var FieldType = /* @__PURE__ */ ((FieldType2) => {
|
|
2
2
|
FieldType2["ID"] = "ID";
|
|
3
3
|
FieldType2["NAME"] = "NAME";
|
|
4
|
-
FieldType2["
|
|
4
|
+
FieldType2["FREE_PROPERTIES"] = "FREE_PROPERTIES";
|
|
5
5
|
FieldType2["NOMINAL_VOLTAGE"] = "NOMINAL_VOLTAGE";
|
|
6
6
|
FieldType2["MIN_P"] = "MIN_P";
|
|
7
7
|
FieldType2["MAX_P"] = "MAX_P";
|
|
@@ -101,14 +101,13 @@ var FieldType = /* @__PURE__ */ ((FieldType2) => {
|
|
|
101
101
|
FieldType2["PHASE_REGULATION_VALUE_1"] = "PHASE_REGULATION_VALUE_1";
|
|
102
102
|
FieldType2["PHASE_REGULATION_VALUE_2"] = "PHASE_REGULATION_VALUE_2";
|
|
103
103
|
FieldType2["PHASE_REGULATION_VALUE_3"] = "PHASE_REGULATION_VALUE_3";
|
|
104
|
-
FieldType2["
|
|
105
|
-
FieldType2["
|
|
106
|
-
FieldType2["
|
|
107
|
-
FieldType2["
|
|
108
|
-
FieldType2["
|
|
109
|
-
FieldType2["
|
|
110
|
-
FieldType2["
|
|
111
|
-
FieldType2["VOLTAGE_LEVEL_PROPERTY_3"] = "VOLTAGE_LEVEL_PROPERTY_3";
|
|
104
|
+
FieldType2["SUBSTATION_PROPERTIES"] = "SUBSTATION_PROPERTIES";
|
|
105
|
+
FieldType2["SUBSTATION_PROPERTIES_1"] = "SUBSTATION_PROPERTIES_1";
|
|
106
|
+
FieldType2["SUBSTATION_PROPERTIES_2"] = "SUBSTATION_PROPERTIES_2";
|
|
107
|
+
FieldType2["VOLTAGE_LEVEL_PROPERTIES"] = "VOLTAGE_LEVEL_PROPERTIES";
|
|
108
|
+
FieldType2["VOLTAGE_LEVEL_PROPERTIES_1"] = "VOLTAGE_LEVEL_PROPERTIES_1";
|
|
109
|
+
FieldType2["VOLTAGE_LEVEL_PROPERTIES_2"] = "VOLTAGE_LEVEL_PROPERTIES_2";
|
|
110
|
+
FieldType2["VOLTAGE_LEVEL_PROPERTIES_3"] = "VOLTAGE_LEVEL_PROPERTIES_3";
|
|
112
111
|
FieldType2["SVAR_REGULATION_MODE"] = "SVAR_REGULATION_MODE";
|
|
113
112
|
FieldType2["VOLTAGE_SET_POINT"] = "VOLTAGE_SET_POINT";
|
|
114
113
|
FieldType2["ACTIVE_POWER_SET_POINT"] = "ACTIVE_POWER_SET_POINT";
|