Merge pull request #200 from NaveenKinnal/feature/v23_bugfix_new

Webapp changes for job and files deletion
SAP · Mar 6, 2023 · b6401bd · b6401bd
2 parents bc55c88 + 9b838af
commit b6401bd
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 10,316 deletions.
diff --git a/client/Pipfile.lock b/client/Pipfile.lock
diff --git a/client/setup.py b/client/setup.py
@@ -66,6 +66,7 @@
             "mypy",
             "black",
             "isort",
+            "colorama",
             "pydocstyle",
             "isort",
             "lazydocs",

diff --git a/components/lab-job-scheduler/backend/Pipfile.lock b/components/lab-job-scheduler/backend/Pipfile.lock
diff --git a/components/lab-job-scheduler/backend/setup.py b/components/lab-job-scheduler/backend/setup.py
@@ -71,6 +71,7 @@
             "black",
             "pydocstyle",
             "isort",
+            "colorama",
             "lazydocs",
             "locust",
             # Test profiling

diff --git a/components/lab-job-scheduler/backend/src/lab_job_scheduler/app.py b/components/lab-job-scheduler/backend/src/lab_job_scheduler/app.py
@@ -44,7 +44,6 @@ def on_startup() -> None:
     component_manager: ComponentOperations = get_component_manager(token=token)
 
     with lock:
-
         # cache all scheduled jobs from the database
         for project in component_manager.get_project_manager().list_projects():
             scheduled_jobs = get_all_scheduled_jobs_from_db(
@@ -105,7 +104,6 @@ def create_schedule(
 def list_schedules(
     project_id: str,
 ) -> Any:
-
     with lock:
         if project_id not in cached_scheduled_jobs:
             return []
@@ -125,7 +123,6 @@ def list_schedule(
     project_id: str,
     job_id: str,
 ) -> Any:
-
     with lock:
         if project_id not in cached_scheduled_jobs:
             raise HTTPException(status_code=404, detail="Project not found.")
@@ -233,7 +230,6 @@ def get_all_scheduled_jobs_from_db(
 def get_job_from_job_input(
     job_schedule: ScheduledJobInput, job_id: Optional[str] = None
 ) -> ScheduledJob:
-
     return ScheduledJob(
         cron_string=job_schedule.cron_string,
         job_input=job_schedule.job_input,

diff --git a/components/lab-mlflow-manager/backend/Pipfile.lock b/components/lab-mlflow-manager/backend/Pipfile.lock
diff --git a/components/lab-mlflow-manager/backend/setup.py b/components/lab-mlflow-manager/backend/setup.py
@@ -67,6 +67,7 @@
             "black",
             "pydocstyle",
             "isort",
+            "colorama",
             "lazydocs",
             "locust",
             # Test profiling

diff --git a/components/lab-workspace-manager/backend/Pipfile.lock b/components/lab-workspace-manager/backend/Pipfile.lock
diff --git a/components/lab-workspace-manager/backend/setup.py b/components/lab-workspace-manager/backend/setup.py
@@ -71,6 +71,7 @@
             "black",
             "pydocstyle",
             "isort",
+            "colorama",
             "lazydocs",
             "locust",
             # Test profiling

diff --git a/components/template/backend/Pipfile.lock b/components/template/backend/Pipfile.lock
diff --git a/components/template/backend/setup.py b/components/template/backend/setup.py
@@ -71,6 +71,7 @@
             "black",
             "pydocstyle",
             "isort",
+            "colorama",
             "lazydocs",
             "locust",
             # Test profiling

diff --git a/webapp/src/services/contaxy-client/api/FilesApi.js b/webapp/src/services/contaxy-client/api/FilesApi.js
@@ -136,6 +136,8 @@ export default class FilesApi {
     };
     let queryParams = {
       extension_id: opts['extensionId'],
+      date_from: opts['startDate'],
+      date_to: opts['endDate'],
     };
     let headerParams = {};
     let formParams = {};

diff --git a/webapp/src/services/contaxy-client/api/JobsApi.js b/webapp/src/services/contaxy-client/api/JobsApi.js
@@ -128,6 +128,8 @@ export default class JobsApi {
     };
     let queryParams = {
       extension_id: opts['extensionId'],
+      date_from: opts['startDate'],
+      date_to: opts['endDate'],
     };
     let headerParams = {};
     let formParams = {};