mirror of
https://github.com/dec0dOS/zero-ui.git
synced 2024-09-20 15:06:09 +08:00
fix: parse tags and capabilities in flow rules correctly
This commit is contained in:
parent
ee6a84e1a5
commit
369d96e50a
|
@ -62,6 +62,8 @@ async function createNetworkAdditionalData(nwid) {
|
||||||
additionalConfig: {
|
additionalConfig: {
|
||||||
description: "",
|
description: "",
|
||||||
rulesSource: constants.defaultRulesSource,
|
rulesSource: constants.defaultRulesSource,
|
||||||
|
tagsByName: {},
|
||||||
|
capabilitiesByName: {},
|
||||||
},
|
},
|
||||||
members: [],
|
members: [],
|
||||||
};
|
};
|
||||||
|
@ -79,6 +81,12 @@ async function updateNetworkAdditionalData(nwid, data) {
|
||||||
if (data.hasOwnProperty("rulesSource")) {
|
if (data.hasOwnProperty("rulesSource")) {
|
||||||
additionalData.rulesSource = data.rulesSource;
|
additionalData.rulesSource = data.rulesSource;
|
||||||
}
|
}
|
||||||
|
if (data.hasOwnProperty("tagsByName")) {
|
||||||
|
additionalData.tagsByName = data.tagsByName;
|
||||||
|
}
|
||||||
|
if (data.hasOwnProperty("capabilitiesByName")) {
|
||||||
|
additionalData.capabilitiesByName = data.capabilitiesByName;
|
||||||
|
}
|
||||||
|
|
||||||
if (additionalData) {
|
if (additionalData) {
|
||||||
db.get("networks")
|
db.get("networks")
|
||||||
|
|
|
@ -29,6 +29,10 @@ function NetworkRules({ network }) {
|
||||||
capabilities: [...network.config.capabilities],
|
capabilities: [...network.config.capabilities],
|
||||||
tags: [...network.config.tags],
|
tags: [...network.config.tags],
|
||||||
});
|
});
|
||||||
|
const [tagCapByNameData, setTagCapByNameData] = useState({
|
||||||
|
tagsByName: network.tagsByName || {},
|
||||||
|
capabilitiesByName: network.capabilitiesByName || {},
|
||||||
|
});
|
||||||
const [errors, setErrors] = useState([]);
|
const [errors, setErrors] = useState([]);
|
||||||
const [snackbarOpen, setSnackbarOpen] = useState(false);
|
const [snackbarOpen, setSnackbarOpen] = useState(false);
|
||||||
|
|
||||||
|
@ -37,6 +41,7 @@ function NetworkRules({ network }) {
|
||||||
const req = await API.post("/network/" + network["config"]["id"], {
|
const req = await API.post("/network/" + network["config"]["id"], {
|
||||||
config: { ...flowData },
|
config: { ...flowData },
|
||||||
rulesSource: editor.getValue(),
|
rulesSource: editor.getValue(),
|
||||||
|
...tagCapByNameData,
|
||||||
});
|
});
|
||||||
console.log("Action", req);
|
console.log("Action", req);
|
||||||
setSnackbarOpen(true);
|
setSnackbarOpen(true);
|
||||||
|
@ -51,14 +56,29 @@ function NetworkRules({ network }) {
|
||||||
const src = event.getValue();
|
const src = event.getValue();
|
||||||
setEditor(event);
|
setEditor(event);
|
||||||
let rules = [],
|
let rules = [],
|
||||||
caps = [],
|
caps = {},
|
||||||
tags = [];
|
tags = {};
|
||||||
const res = compile(src, rules, caps, tags);
|
const res = compile(src, rules, caps, tags);
|
||||||
if (!res) {
|
if (!res) {
|
||||||
|
let capabilitiesByName = {};
|
||||||
|
for (var key in caps) {
|
||||||
|
capabilitiesByName[key] = caps[key].id;
|
||||||
|
}
|
||||||
|
|
||||||
|
let tagsByName = { ...tags };
|
||||||
|
for (let key in tags) {
|
||||||
|
tags[key] = { id: tags[key].id, default: tags[key].default };
|
||||||
|
}
|
||||||
|
|
||||||
setFlowData({
|
setFlowData({
|
||||||
rules: [...rules],
|
rules: [...rules],
|
||||||
capabilities: [...caps],
|
capabilities: [...Object.values(caps)],
|
||||||
tags: [...tags],
|
tags: [...Object.values(tags)],
|
||||||
|
});
|
||||||
|
|
||||||
|
setTagCapByNameData({
|
||||||
|
tagsByName: tagsByName,
|
||||||
|
capabilitiesByName: capabilitiesByName,
|
||||||
});
|
});
|
||||||
setErrors([]);
|
setErrors([]);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue