adjust apicalls for rust backend

This commit is contained in:
Samuel Lorch 2023-10-28 19:15:40 +02:00
parent 39abbf9a60
commit c0b5aefa4a
19 changed files with 352 additions and 352 deletions

View file

@ -1,6 +1,6 @@
<script setup lang="ts">
import { editTypes } from "../../../../definitions";
import { apiCall } from "../../../../api";
import { editTypes } from '../../../../definitions';
import { apiCall } from '../../../../api';
import getPlugins from '../../../../plugins';
const p = getPlugins();
@ -13,29 +13,29 @@ let loading = $ref(true);
async function load(){
loading = true;
let res: any;
if (editTypes[subsystem][entity].idType == "Number") {
res = await apiCall(editTypes[subsystem].name +".Get"+ editTypes[subsystem][entity].name, {id: id as number - 0});
if (editTypes[subsystem][entity].idType == 'Number') {
res = await apiCall(`${editTypes[subsystem].name }.get_${ editTypes[subsystem][entity].name}`, {id: id as number - 0});
} else {
res = await apiCall(editTypes[subsystem].name +".Get"+ editTypes[subsystem][entity].name, {id: id});
res = await apiCall(`${editTypes[subsystem].name }.get_${ editTypes[subsystem][entity].name}`, {id: id});
}
if (res.Error === null) {
console.debug("update data", res.Data);
console.debug('update data', res.Data);
initialValues = res.Data;
} else {
console.debug("error", res);
console.debug('error', res);
}
loading = false;
}
async function update(value: any) {
console.debug("value", value);
let res = await apiCall(editTypes[subsystem].name +".Update"+ editTypes[subsystem][entity].name, value);
console.debug('value', value);
let res = await apiCall(`${editTypes[subsystem].name }.update_${ editTypes[subsystem][entity].name}`, value);
if (res.Error === null) {
p.toast.success("Updated " + editTypes[subsystem][entity].name);
p.toast.success(`Updated ${ editTypes[subsystem][entity].name}`);
p.router.go(-1);
} else {
console.debug("error", res);
console.debug('error', res);
}
}

View file

@ -1,6 +1,6 @@
<script setup lang="ts">
import { editTypes } from "../../../../definitions";
import { apiCall } from "../../../../api";
import { editTypes } from '../../../../definitions';
import { apiCall } from '../../../../api';
import getPlugins from '../../../../plugins';
const p = getPlugins();
@ -8,13 +8,13 @@ const props = $defineProps<{subsystem: string, entity: string}>();
const { subsystem, entity } = $(props);
async function create(value: any) {
console.debug("value", value);
let res = await apiCall(editTypes[subsystem].name +".Create"+ editTypes[subsystem][entity].name, value);
console.debug('value', value);
let res = await apiCall(`${editTypes[subsystem].name }.create_${ editTypes[subsystem][entity].name}`, value);
if (res.Error === null) {
p.toast.success("Created " + editTypes[subsystem][entity].name);
p.toast.success(`Created ${ editTypes[subsystem][entity].name}`);
p.router.go(-1);
} else {
console.debug("error", res);
console.debug('error', res);
}
}

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
import getPlugins from '../../plugins';
const p = getPlugins();
@ -29,37 +29,37 @@ const displayData = $computed(() => {
});
async function load(){
loading = true
let res = await apiCall("Config.GetPendingChangelog", {});
loading = true;
let res = await apiCall('config.get_pending_changelog', {});
if (res.Error === null) {
console.debug("changelog", res.Data.Changelog);
changelog = res.Data.Changelog;
console.debug('changelog', res.Data);
changelog = res.Data;
} else {
console.debug("error", res);
console.debug('error', res);
}
loading = false
loading = false;
}
async function apply(){
let res = await apiCall("Config.ApplyPendingChanges", {});
let res = await apiCall('config.apply_pending_changes', {});
if (res.Error === null) {
console.debug("apply");
p.toast.success("Applied Pending Config");
console.debug('apply');
p.toast.success('Applied Pending Config');
} else {
console.debug("error", res);
console.debug('error', res);
}
load()
load();
}
async function discard(){
let res = await apiCall("Config.DiscardPendingChanges", {});
let res = await apiCall('config.discard_pending_changes', {});
if (res.Error === null) {
console.debug("discard");
p.toast.success("Discarded Pending Config");
console.debug('discard');
p.toast.success('Discarded Pending Config');
} else {
console.debug("error", res);
console.debug('error', res);
}
load()
load();
}
onMounted(async() => {
@ -69,9 +69,9 @@ onMounted(async() => {
</script>
<template>
<TableView title="Pending Changes" :columns="columns" :loading="loading" v-model:data="displayData" :table-props="{sort:true, sortSelf: true}">
<button @click="load">Refresh</button>
<button @click="apply">Apply</button>
<button @click="discard">Discard</button>
</TableView>
<TableView title="Pending Changes" :columns="columns" :loading="loading" v-model:data="displayData" :table-props="{sort:true, sortSelf: true}">
<button @click="load">Refresh</button>
<button @click="apply">Apply</button>
<button @click="discard">Discard</button>
</TableView>
</template>

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
import getPlugins from '../../plugins';
const p = getPlugins();
@ -19,34 +19,34 @@ const columns = [
];
async function load(){
let res = await apiCall("Firewall.GetDestinationNATRules", {});
let res = await apiCall('firewall.get_destination_nat_rules', {});
if (res.Error === null) {
rules = res.Data.destination_nat_rules;
console.debug("rules", rules);
rules = res.Data;
console.debug('rules', rules);
} else {
console.debug("error", res);
console.debug('error', res);
}
}
async function deleteRule(){
let res = await apiCall("Firewall.DeleteDestinationNATRule", {index: selection[0]});
let res = await apiCall('firewall.delete_destination_nat_rule', {index: selection[0]});
if (res.Error === null) {
console.debug("deleted rule");
p.toast.success("Deleted Rule");
console.debug('deleted rule');
p.toast.success('Deleted Rule');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}
async function draggedRow(draggedRow: number, draggedOverRow: number) {
console.log("dragged", draggedRow, draggedOverRow);
let res = await apiCall("Firewall.MoveDestinationNATRule", {index: draggedRow, to_index: draggedOverRow});
console.log('dragged', draggedRow, draggedOverRow);
let res = await apiCall('firewall.move_destination_nat_rule', {index: draggedRow, to_index: draggedOverRow});
if (res.Error === null) {
console.debug("moved rule");
p.toast.success("Moved Rule");
console.debug('moved rule');
p.toast.success('Moved Rule');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
import getPlugins from '../../plugins';
const p = getPlugins();
@ -18,34 +18,34 @@ const columns = [
];
async function load(){
let res = await apiCall("Firewall.GetForwardRules", {});
let res = await apiCall('firewall.get_forward_rules', {});
if (res.Error === null) {
rules = res.Data.forward_rules;
console.debug("rules", rules);
rules = res.Data;
console.debug('rules', rules);
} else {
console.debug("error", res);
console.debug('error', res);
}
}
async function deleteRule(){
let res = await apiCall("Firewall.DeleteForwardRule", {index: selection[0]});
let res = await apiCall('firewall.delete_forward_rule', {index: selection[0]});
if (res.Error === null) {
console.debug("deleted rule");
p.toast.success("Deleted Rule");
console.debug('deleted rule');
p.toast.success('Deleted Rule');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}
async function draggedRow(draggedRow: number, draggedOverRow: number) {
console.log("dragged", draggedRow, draggedOverRow);
let res = await apiCall("Firewall.MoveForwardRule", {index: draggedRow, to_index: draggedOverRow});
console.log('dragged', draggedRow, draggedOverRow);
let res = await apiCall('firewall.move_forward_rule', {index: draggedRow, to_index: draggedOverRow});
if (res.Error === null) {
console.debug("moved rule");
p.toast.success("Moved Rule");
console.debug('moved rule');
p.toast.success('Moved Rule');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}
@ -58,7 +58,7 @@ onMounted(async() => {
<template>
<div>
<TableView title="Forward Rules" :columns="columns" :loading="loading" @draggedRow="draggedRow" v-model:selection="selection" v-model:data="rules" :table-props="{sort:true, sortSelf: true, draggable: true}">
<TableView title="Forward Rules" :columns="columns" :loading="loading" @draggedRow="draggedRow" v-model:selection="selection" v-model:data="rules" :table-props="{sort:true, sortSelf: true, draggable: true}">
<button @click="load">Refresh</button>
<router-link class="button" to="/firewall/forwardrules/edit">Create</router-link>
<router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/firewall/forwardrules/edit/' + selection[0]">Edit</router-link>

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
import getPlugins from '../../plugins';
const p = getPlugins();
@ -19,34 +19,34 @@ const columns = [
];
async function load(){
let res = await apiCall("Firewall.GetSourceNATRules", {});
let res = await apiCall('firewall.get_source_nat_rules', {});
if (res.Error === null) {
rules = res.Data.source_nat_rules;
console.debug("rules", rules);
rules = res.Data;
console.debug('rules', rules);
} else {
console.debug("error", res);
console.debug('error', res);
}
}
async function deleteRule(){
let res = await apiCall("Firewall.DeleteSourceNATRule", {index: selection[0]});
let res = await apiCall('firewall.delete_source_nat:rule', {index: selection[0]});
if (res.Error === null) {
console.debug("deleted rule");
p.toast.success("Deleted Rule");
console.debug('deleted rule');
p.toast.success('Deleted Rule');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}
async function draggedRow(draggedRow: number, draggedOverRow: number) {
console.log("dragged", draggedRow, draggedOverRow);
let res = await apiCall("Firewall.MoveSourceNATRule", {index: draggedRow, to_index: draggedOverRow});
console.log('dragged', draggedRow, draggedOverRow);
let res = await apiCall('firewall.move_source_nat_rule', {index: draggedRow, to_index: draggedOverRow});
if (res.Error === null) {
console.debug("moved rule");
p.toast.success("Moved Rule");
console.debug('moved rule');
p.toast.success('Moved Rule');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}

View file

@ -1,17 +1,17 @@
<script setup lang="ts">
import { apiCall } from "../api";
import { apiCall } from '../api';
let links = $ref([]);
let loading = $ref(false);
async function load(){
loading = true;
let res = await apiCall("Network.GetLinks", {});
let res = await apiCall('network.get_links', {});
if (res.Error === null) {
console.debug("links", res.Data.Links);
links = res.Data.Links;
console.debug('links', res.Data);
links = res.Data;
} else {
console.debug("error", res);
console.debug('error', res);
}
loading = false;
}

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
import getPlugins from '../../plugins';
const p = getPlugins();
@ -31,29 +31,29 @@ const displayData = $computed(() => {
});
async function load(){
loading = true
let res = await apiCall("Network.GetInterfaces", {});
loading = true;
let res = await apiCall('network.get_interfaces', {});
if (res.Error === null) {
console.debug("interfaces", res.Data.Interfaces);
interfaces = res.Data.Interfaces;
console.debug('interfaces', res.Data);
interfaces = res.Data;
} else {
console.debug("error", res);
console.debug('error', res);
}
loading = false
loading = false;
}
async function deleteInterface(){
let res = await apiCall("Network.DeleteInterface", {name: displayData[selection[0]].name});
let res = await apiCall('network.delete_interface', {name: displayData[selection[0]].name});
if (res.Error === null) {
console.debug("deleted interface");
console.debug('deleted interface');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}
async function editInterface() {
p.router.push("/network/interfaces/edit/" + displayData[selection[0]].name)
p.router.push(`/network/interfaces/edit/${ displayData[selection[0]].name}`);
}
onMounted(async() => {

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
let staticRoutes = $ref([]);
let loading = $ref(false);
@ -14,23 +14,23 @@ const columns = [
];
async function load(){
loading = true
let res = await apiCall("Network.GetStaticRoutes", {});
loading = true;
let res = await apiCall('network.get_static_routes', {});
if (res.Error === null) {
console.debug("staticRoutes", res.Data.StaticRoutes);
staticRoutes = res.Data.StaticRoutes;
console.debug('staticRoutes', res.Data);
staticRoutes = res.Data;
} else {
console.debug("error", res);
console.debug('error', res);
}
loading = false
loading = false;
}
async function deleteStaticRoutes(){
let res = await apiCall("Network.DeleteStaticRoute", {index: selection[0]});
let res = await apiCall('network.delete_static_route', {index: selection[0]});
if (res.Error === null) {
console.debug("deleted static routes");
console.debug('deleted static routes');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
import getPlugins from '../../plugins';
const p = getPlugins();
@ -16,12 +16,12 @@ const columns = [
async function load(){
loading = true;
let res = await apiCall("Object.GetAddresses", {});
let res = await apiCall('object.get_addresses', {});
if (res.Error === null) {
addresses = res.Data.Addresses;
console.debug("addresses", addresses);
addresses = res.Data;
console.debug('addresses', addresses);
} else {
console.debug("error", res);
console.debug('error', res);
}
loading = false;
}
@ -43,36 +43,36 @@ const displayData = $computed(() => {
function getAddressValue(s: any): string {
let value: string;
switch (s.type) {
case "host":
case 'host':
value = s.host;
break;
case "range":
case 'range':
value = s.range;
break;
case "network":
case 'network':
value = s.network;
break;
case "group":
case 'group':
value = s.children;
break;
default:
value = "unkown";
value = 'unkown';
}
return value;
}
async function deleteAddress(){
let res = await apiCall("Object.DeleteAddress", {name: displayData[selection[0]].name});
let res = await apiCall('object.delete_address', {name: displayData[selection[0]].name});
if (res.Error === null) {
console.debug("deleted address");
console.debug('deleted address');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}
async function editAddress() {
p.router.push("/object/addresses/edit/" + displayData[selection[0]].name);
p.router.push(`/object/addresses/edit/${ displayData[selection[0]].name}`);
}
onMounted(async() => {

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
import getPlugins from '../../plugins';
const p = getPlugins();
@ -31,53 +31,53 @@ const displayData = $computed(() => {
function getServiceValue(s: any): string {
let value: string;
switch (s.type) {
case "tcp":
case "udp":
case 'tcp':
case 'udp':
value = getServicePortRange(s);
break;
case "icmp":
value = "icmp";
case 'icmp':
value = 'icmp';
break;
case "group":
case 'group':
value = s.children;
break;
default:
value = "unkown";
value = 'unkown';
}
return value;
}
function getServicePortRange(s:any): string {
if (s.dport_end) {
return s.dport_start + "-" + s.dport_end;
return `${s.dport_start }-${ s.dport_end}`;
}
return s.dport_start;
}
async function load(){
loading = true;
let res = await apiCall("Object.GetServices", {});
let res = await apiCall('object.get_services', {});
if (res.Error === null) {
console.debug("services", res.Data.Services);
services = res.Data.Services;
console.debug('services', res.Data);
services = res.Data;
} else {
console.debug("error", res);
console.debug('error', res);
}
loading = false;
}
async function deleteService(){
let res = await apiCall("Object.DeleteService", {name: displayData[selection[0]].name});
let res = await apiCall('object.delete_service', {name: displayData[selection[0]].name});
if (res.Error === null) {
console.debug("deleted service");
console.debug('deleted service');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}
async function editService() {
p.router.push("/object/services/edit/" + displayData[selection[0]].name);
p.router.push(`/object/services/edit/${ displayData[selection[0]].name}`);
}
onMounted(async() => {

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
import getPlugins from '../../plugins';
const p = getPlugins();
@ -13,22 +13,22 @@ const columns = [
];
async function load(){
let res = await apiCall("Service.GetDHCPv4Servers", {});
let res = await apiCall('service.get_dhcp_v4_servers', {});
if (res.Error === null) {
servers = res.Data.dhcp_v4_servers;
console.debug("rules", servers);
servers = res.Data;
console.debug('rules', servers);
} else {
console.debug("error", res);
console.debug('error', res);
}
}
async function deleteRule(){
let res = await apiCall("Service.DeleteDHCPv4Server", {index: selection[0]});
let res = await apiCall('service.delete_dhcp_v4_server', {index: selection[0]});
if (res.Error === null) {
console.debug("deleted server");
p.toast.success("Deleted DHCP Server");
console.debug('deleted server');
p.toast.success('Deleted DHCP Server');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
import getPlugins from '../../plugins';
const p = getPlugins();
@ -13,22 +13,22 @@ const columns = [
];
async function load(){
let res = await apiCall("Service.GetDNSServers", {});
let res = await apiCall('service.get_dns_servers', {});
if (res.Error === null) {
servers = res.Data.dns_servers;
console.debug("rules", servers);
servers = res.Data;
console.debug('rules', servers);
} else {
console.debug("error", res);
console.debug('error', res);
}
}
async function deleteRule(){
let res = await apiCall("Service.DeleteDNSServer", {index: selection[0]});
let res = await apiCall('service.delete_dns_server', {index: selection[0]});
if (res.Error === null) {
console.debug("deleted server");
p.toast.success("Deleted DNS Server");
console.debug('deleted server');
p.toast.success('Deleted DNS Server');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
import getPlugins from '../../plugins';
const p = getPlugins();
@ -13,22 +13,22 @@ const columns = [
];
async function load(){
let res = await apiCall("Service.GetNTPServers", {});
let res = await apiCall('service.get_ntp_servers', {});
if (res.Error === null) {
servers = res.Data.ntp_servers;
console.debug("rules", servers);
servers = res.Data;
console.debug('rules', servers);
} else {
console.debug("error", res);
console.debug('error', res);
}
}
async function deleteRule(){
let res = await apiCall("Service.DeleteNTPServer", {index: selection[0]});
let res = await apiCall('service.delete_ntp_server', {index: selection[0]});
if (res.Error === null) {
console.debug("deleted server");
p.toast.success("Deleted NTP Server");
console.debug('deleted server');
p.toast.success('Deleted NTP Server');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
import getPlugins from '../../plugins';
const p = getPlugins();
@ -14,12 +14,12 @@ const columns = [
async function load(){
loading = true;
let res = await apiCall("System.GetUsers", {});
let res = await apiCall('system.get_users', {});
if (res.Error === null) {
users = res.Data.Users;
console.debug("users", users);
users = res.Data;
console.debug('users', users);
} else {
console.debug("error", res);
console.debug('error', res);
}
loading = false;
}
@ -38,17 +38,17 @@ const displayData = $computed(() => {
async function deleteUser(){
let res = await apiCall("System.DeleteUser", {name: displayData[selection[0]].name});
let res = await apiCall('system.delete_user', {name: displayData[selection[0]].name});
if (res.Error === null) {
console.debug("deleted user");
console.debug('deleted user');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}
async function editUser() {
p.router.push("/system/users/edit/" + displayData[selection[0]].name);
p.router.push(`/system/users/edit/${ displayData[selection[0]].name}`);
}
onMounted(async() => {

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
import getPlugins from '../../plugins';
const p = getPlugins();
@ -31,28 +31,28 @@ const displayData = $computed(() => {
async function load(){
loading = true;
let res = await apiCall("VPN.GetWireguardInterfaces", {});
let res = await apiCall('cpn.get_wireguard_interfaces', {});
if (res.Error === null) {
console.debug("interfaces", res.Data.Interfaces);
interfaces = res.Data.Interfaces;
console.debug('interfaces', res.Data);
interfaces = res.Data;
} else {
console.debug("error", res);
console.debug('error', res);
}
loading = false;
}
async function deleteInterface(){
let res = await apiCall("VPN.DeleteWireguardInterface", {name: displayData[selection[0]].name});
let res = await apiCall('vpn.delete_wireguard_interface', {name: displayData[selection[0]].name});
if (res.Error === null) {
console.debug("deleted interface");
console.debug('deleted interface');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}
async function editInterface() {
p.router.push("/vpn/wireguardinterfaces/edit/" + displayData[selection[0]].name);
p.router.push(`/vpn/wireguardinterfaces/edit/${ displayData[selection[0]].name}`);
}
onMounted(async() => {

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
import getPlugins from '../../plugins';
const p = getPlugins();
@ -32,28 +32,28 @@ const displayData = $computed(() => {
async function load(){
loading = true;
let res = await apiCall("VPN.GetWireguardPeers", {});
let res = await apiCall('vpn.get_wireguard_peers', {});
if (res.Error === null) {
console.debug("peers", res.Data.WireguardPeers);
peers = res.Data.WireguardPeers;
console.debug('peers', res.Data);
peers = res.Data;
} else {
console.debug("error", res);
console.debug('error', res);
}
loading = false;
}
async function deletePeer(){
let res = await apiCall("VPN.DeleteWireguardPeer", {name: displayData[selection[0]].name});
let res = await apiCall('vpn.delete_wireguard_peer', {name: displayData[selection[0]].name});
if (res.Error === null) {
console.debug("deleted peer");
console.debug('deleted peer');
} else {
console.debug("error", res);
console.debug('error', res);
}
load();
}
async function editPeer() {
p.router.push("/vpn/wireguardpeers/edit/" + displayData[selection[0]].name);
p.router.push(`/vpn/wireguardpeers/edit/${ displayData[selection[0]].name}`);
}
onMounted(async() => {

View file

@ -1,17 +1,17 @@
<script setup lang="ts">
import { apiCall } from "../../api";
import { apiCall } from '../../api';
let status = $ref("");
let status = $ref('');
let loading = $ref(false);
async function load() {
loading = true;
let res = await apiCall("VPN.GetWireguardStatus", {});
let res = await apiCall('vpn.get_wireguard_status', {});
if (res.Error === null) {
console.debug("status", res.Data.Status);
status = res.Data.Status;
console.debug('status', res.Data);
status = res.Data;
} else {
console.debug("error", res);
console.debug('error', res);
}
loading = false;
}