From 088ff943fe1c8f2042f5030bf08662444794c493 Mon Sep 17 00:00:00 2001 From: "christopher.tubbs" Date: Thu, 23 May 2024 16:59:59 -0500 Subject: [PATCH] Removed an invalid field on the GUI's eval search, added in the newly required dependency on the daphne app for the use of websockets in the django apps, and commented out the broken views in the gui --- python/gui/MaaS/static/maas/js/ready_evaluation.js | 9 --------- python/gui/MaaS/templates/maas/ready_evaluation.html | 1 - python/gui/MaaS/urls.py | 8 ++++---- python/gui/maas_experiment/settings.py | 1 + .../dmod/evaluationservice/service/settings.py | 1 + 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/python/gui/MaaS/static/maas/js/ready_evaluation.js b/python/gui/MaaS/static/maas/js/ready_evaluation.js index 12679a545..ed55d393f 100644 --- a/python/gui/MaaS/static/maas/js/ready_evaluation.js +++ b/python/gui/MaaS/static/maas/js/ready_evaluation.js @@ -1055,15 +1055,6 @@ async function renderDefinitions(event, socket) { row.appendChild(descriptionCell); - let lastModifiedCell = document.createElement("td"); - lastModifiedCell.id = `${definition.identifier}-last_modified`; - lastModifiedCell.classList.add("last_modified-cell"); - lastModifiedCell.classList.add("search-cell"); - lastModifiedCell.textContent = definition.last_modified.trim(); - lastModifiedCell.setAttribute("identifier", definition.identifier); - - row.appendChild(lastModifiedCell); - searchTableBody.appendChild(row); } diff --git a/python/gui/MaaS/templates/maas/ready_evaluation.html b/python/gui/MaaS/templates/maas/ready_evaluation.html index 49d677e91..6a775db50 100644 --- a/python/gui/MaaS/templates/maas/ready_evaluation.html +++ b/python/gui/MaaS/templates/maas/ready_evaluation.html @@ -236,7 +236,6 @@

Responses

Author Name Description - Last Modified diff --git a/python/gui/MaaS/urls.py b/python/gui/MaaS/urls.py index c84b03f32..ab731d963 100644 --- a/python/gui/MaaS/urls.py +++ b/python/gui/MaaS/urls.py @@ -1,19 +1,19 @@ from maas_experiment import application_values from django.urls import re_path -from .cbv.EditView import EditView +#from .cbv.EditView import EditView from .cbv.MapView import MapView, Fabrics, FabricNames, FabricTypes, ConnectedFeatures from .cbv.evaluation import ReadyListenEvaluation from .cbv.evaluation import EvaluationListing from .cbv.configuration import CreateConfiguration -from .cbv.execution import Execute +#from .cbv.execution import Execute from .cbv.crosswalk import Crosswalk from .cbv.prototyping import RuntimePrototype app_name = 'MaaS' urlpatterns = [ - re_path(r'^$', EditView.as_view()), + #re_path(r'^$', EditView.as_view()), re_path(r'map$', MapView.as_view(), name="map"), re_path(r'evaluation$', ReadyListenEvaluation.as_view(), name="ready-evaluation"), re_path(r'evaluation/listings$', EvaluationListing.as_view(), name="evaluation-listing"), @@ -22,7 +22,7 @@ re_path(r'fabric/types$', FabricTypes.as_view(), name='fabric-types'), re_path(r'fabric/(?P[a-zA-Z0-9_-]+(\s\([a-zA-Z0-9_-]+\))*)?', Fabrics.as_view(), name='fabrics'), re_path(r'config/edit', CreateConfiguration.as_view(), name='create_config'), - re_path(r'config/execute', Execute.as_view(), name='execute'), + #re_path(r'config/execute', Execute.as_view(), name='execute'), re_path(r'crosswalk/(?P[a-zA-Z0-9_-]+(\s\([a-zA-Z0-9_-]+\))*)?', Crosswalk.as_view(), name='crosswalk') ] diff --git a/python/gui/maas_experiment/settings.py b/python/gui/maas_experiment/settings.py index 6e9a6f9b5..fe7ba861e 100644 --- a/python/gui/maas_experiment/settings.py +++ b/python/gui/maas_experiment/settings.py @@ -60,6 +60,7 @@ # Application definition INSTALLED_APPS = [ + 'daphne', 'channels', 'django.contrib.admin', 'django.contrib.auth', diff --git a/python/services/evaluationservice/dmod/evaluationservice/service/settings.py b/python/services/evaluationservice/dmod/evaluationservice/service/settings.py index 36bba01b8..18b104878 100644 --- a/python/services/evaluationservice/dmod/evaluationservice/service/settings.py +++ b/python/services/evaluationservice/dmod/evaluationservice/service/settings.py @@ -33,6 +33,7 @@ # Application definition INSTALLED_APPS = [ + 'daphne', 'channels', 'django.forms', 'evaluation_service.apps.EvaluationServiceConfig',