diff --git a/sist2-admin/frontend/src/Sist2AdminApi.js b/sist2-admin/frontend/src/Sist2AdminApi.js index 20acf49..4822db8 100644 --- a/sist2-admin/frontend/src/Sist2AdminApi.js +++ b/sist2-admin/frontend/src/Sist2AdminApi.js @@ -89,9 +89,12 @@ class Sist2AdminApi { /** * @param {string} name + * @param {bool} full */ - runJob(name) { - return axios.get(`${this.baseUrl}/api/job/${name}/run`); + runJob(name, full) { + return axios.get(`${this.baseUrl}/api/job/${name}/run`, { + params: {full} + }); } /** diff --git a/sist2-admin/frontend/src/i18n/messages.js b/sist2-admin/frontend/src/i18n/messages.js index c96b5fd..a012d94 100644 --- a/sist2-admin/frontend/src/i18n/messages.js +++ b/sist2-admin/frontend/src/i18n/messages.js @@ -8,6 +8,7 @@ export default { view: "View", delete: "Delete", runNow: "Index now", + runNowFull: "Full re-index", create: "Create", cancel: "Cancel", test: "Test", diff --git a/sist2-admin/frontend/src/views/Job.vue b/sist2-admin/frontend/src/views/Job.vue index 8db8ade..a87896f 100644 --- a/sist2-admin/frontend/src/views/Job.vue +++ b/sist2-admin/frontend/src/views/Job.vue @@ -6,7 +6,19 @@
- {{ $t("runNow") }} + + + {{ $t("runNowFull") }} + + {{ $t("delete") }}
@@ -69,6 +81,7 @@ export default { return { loading: true, job: null, + console: console } }, methods: { @@ -78,8 +91,8 @@ export default { update() { Sist2AdminApi.updateJob(this.getName(), this.job); }, - runJob() { - Sist2AdminApi.runJob(this.getName()).then(() => { + runJob(full = false) { + Sist2AdminApi.runJob(this.getName(), full).then(() => { this.$bvToast.toast(this.$t("runJobConfirmation"), { title: this.$t("runJobConfirmationTitle"), variant: "success", diff --git a/sist2-admin/sist2_admin/app.py b/sist2-admin/sist2_admin/app.py index 7195317..8a2f65a 100644 --- a/sist2-admin/sist2_admin/app.py +++ b/sist2-admin/sist2_admin/app.py @@ -169,11 +169,14 @@ def _run_job(job: Sist2Job): @app.get("/api/job/{name:str}/run") -async def run_job(name: str): - job = db["jobs"][name] +async def run_job(name: str, full: bool = False): + job: Sist2Job = db["jobs"][name] if not job: raise HTTPException(status_code=404) + if full: + job.do_full_scan = True + _run_job(job) return "ok"