fix broken api

master
plazmoid 2 years ago
parent a21bc40323
commit 7e267b0074
  1. 18
      Cargo.lock
  2. 3
      bin/u_panel/src/argparse.rs
  3. 2
      bin/u_panel/src/gui/fe/src/app/core/tables/dialogs/job_info.component.ts
  4. 2
      bin/u_panel/src/gui/fe/src/app/core/tables/job.component.ts
  5. 2
      bin/u_panel/src/gui/fe/src/environments/environment.ts
  6. 10
      bin/u_server/src/handlers.rs

18
Cargo.lock generated

@ -182,7 +182,7 @@ dependencies = [
"serde_urlencoded",
"smallvec",
"socket2",
"time 0.3.18",
"time 0.3.19",
"url",
]
@ -462,7 +462,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
dependencies = [
"percent-encoding",
"time 0.3.18",
"time 0.3.19",
"version_check",
]
@ -679,9 +679,9 @@ dependencies = [
[[package]]
name = "diesel-derive-enum"
version = "2.0.0"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da058511a3fab4167647a6f48c5fe9372cc855cd49b008819fcd0989eb83f420"
checksum = "6b10c03b954333d05bfd5be1d8a74eae2c9ca77b86e0f1c3a1ea29c49da1d6c2"
dependencies = [
"heck 0.4.1",
"proc-macro2",
@ -2345,9 +2345,9 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.18"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af0097eaf301d576d0b2aead7a59facab6d53cc636340f0291fab8446a2e8613"
checksum = "53250a3b3fed8ff8fd988587d8925d26a83ac3845d9e03b220b37f34c2b8d6c2"
dependencies = [
"itoa",
"serde",
@ -2363,9 +2363,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
[[package]]
name = "time-macros"
version = "0.2.6"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
checksum = "a460aeb8de6dcb0f381e1ee05f1cd56fcf5a5f6eb8187ff3d8f0b11078d38b7c"
dependencies = [
"time-core",
]
@ -2509,7 +2509,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
dependencies = [
"crossbeam-channel",
"time 0.3.18",
"time 0.3.19",
"tracing-subscriber",
]

@ -97,7 +97,8 @@ pub async fn process_cmd(client: ClientHandler, args: Args) -> PanelResult<Value
into_value(client.upload_jobs(job).await?)
}
JobCRUD::RUD(RUD::Read { id }) => match id {
Some(id) => into_value(client.get_job(id).await?),
//todo: use vec not to break frontend api, possibly refactor later
Some(id) => into_value(vec![client.get_job(id).await?]),
None => into_value(client.get_jobs().await?),
},
JobCRUD::RUD(RUD::Update { item }) => {

@ -1,7 +1,7 @@
import { Component, Inject } from '@angular/core';
import { MAT_DIALOG_DATA } from '@angular/material/dialog';
import { JobModel } from '../../models/job.model';
import { EventEmitter } from '@angular/core';
import { JobModel } from '../../models/job.model';
@Component({
selector: 'job-info-dialog',

@ -41,7 +41,7 @@ export class JobComponent extends TablesComponent<JobModel> {
} else {
this.openSnackBar(resp.data)
}
}).catch((err: HttpErrorResponse) => this.openSnackBar(err.error))
}).catch((err: any) => this.openSnackBar(err))
}
if (id) {

@ -4,7 +4,7 @@
export const environment = {
production: false,
server: "http://127.0.0.1:8080",
server: "http://127.0.0.1:7799",
};
/*

@ -164,13 +164,15 @@ impl Endpoints {
warn!("Agent ids are not equal! actual id: {agent_id}, id from job: {result_agent_id}");
continue;
}
result.state = JobState::Finished;
result.touch();
info!("agent {agent_id} updated job {}", result.id);
match result.exec_type {
JobType::Init => match &result.result {
JobType::Init => {
result.state = JobState::Finished;
match &result.result {
Some(rbytes) => {
let mut agent: Agent = match serde_json::from_slice(&rbytes) {
Ok(a) => a,
@ -183,8 +185,10 @@ impl Endpoints {
db.insert_agent(&agent)?;
}
None => error!("Empty agent data"),
}},
JobType::Shell => {
result.state = JobState::Finished
},
JobType::Shell => (),
JobType::Service => (),
JobType::Terminate => todo!(),
JobType::Update => todo!(),

Loading…
Cancel
Save