Skip to content

Commit

Permalink
Removed an invalid field on the GUI's eval search, added in the newly…
Browse files Browse the repository at this point in the history
… required dependency on the daphne app for the use of websockets in the django apps, and commented out the broken views in the gui
  • Loading branch information
christophertubbs authored and aaraney committed May 23, 2024
1 parent 26eae74 commit 088ff94
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 14 deletions.
9 changes: 0 additions & 9 deletions python/gui/MaaS/static/maas/js/ready_evaluation.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
1 change: 0 additions & 1 deletion python/gui/MaaS/templates/maas/ready_evaluation.html
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ <h3>Responses</h3>
<th>Author</th>
<th>Name</th>
<th>Description</th>
<th>Last Modified</th>
</tr>
<tr id="search-filter-row">
<td>
Expand Down
8 changes: 4 additions & 4 deletions python/gui/MaaS/urls.py
Original file line number Diff line number Diff line change
@@ -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"),
Expand All @@ -22,7 +22,7 @@
re_path(r'fabric/types$', FabricTypes.as_view(), name='fabric-types'),
re_path(r'fabric/(?P<fabric>[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<crosswalk>[a-zA-Z0-9_-]+(\s\([a-zA-Z0-9_-]+\))*)?', Crosswalk.as_view(), name='crosswalk')
]

Expand Down
1 change: 1 addition & 0 deletions python/gui/maas_experiment/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
# Application definition

INSTALLED_APPS = [
'daphne',
'channels',
'django.contrib.admin',
'django.contrib.auth',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
# Application definition

INSTALLED_APPS = [
'daphne',
'channels',
'django.forms',
'evaluation_service.apps.EvaluationServiceConfig',
Expand Down

0 comments on commit 088ff94

Please sign in to comment.