Skip to content

feat: removes getCurrentVersion function and hardcodes modal version to v2 #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
helen-m-lin merged 2 commits into from
Sep 24, 2025
Merged

feat: removes getCurrentVersion function and hardcodes modal version to v2 #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeea4e1
feat: removes getCurrentVersion function and hardcodes modal version …
johendrickson Sep 22, 2025
f23f185
feat: Use DEFAULT_VERSION constant from Jinja context instead of hard…
johendrickson Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/aind_data_transfer_service/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,8 +763,7 @@ async def job_params(request: Request):
"project_names_url": os.getenv(
"AIND_METADATA_SERVICE_PROJECT_NAMES_URL"
),
"versions": ["v1", "v2"],
"default_version": "v1",
"default_version": "v2",
"modalities": JobParamInfo._MODALITIES_LIST,
"modality_tasks": JobParamInfo._MODALITY_TASKS,
}
Expand Down
39 changes: 9 additions & 30 deletions src/aind_data_transfer_service/templates/job_params.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,6 @@
</nav>
<div class="content">
<h4 class="mb-2">
<!-- dropdown to switch version -->
<div id="version-dropdown" class="btn-group mb-2">
<button id="version-button" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown">
{{default_version}}
</button>
<ul class="dropdown-menu">
{% for v in versions %}
<button class="dropdown-item" type="button">{{ v }}</button>
{% endfor %}
</ul>
</div>
<span>Job Parameters</span>
</h4>
<!-- button and modal for adding new parameters-->
Expand Down Expand Up @@ -135,6 +124,7 @@ <h5 class="modal-title" id="param-modal-label"></h5>
</div>
<script>
const MODALITY_TASKS = {{ modality_tasks | tojson }}; // from Jinja context
const DEFAULT_VERSION = "{{ default_version }}";
const MODAL_ID = 'param-modal';
$(document).ready(function() {
createJobParamsTable();
Expand All @@ -148,7 +138,7 @@ <h5 class="modal-title" id="param-modal-label"></h5>
modal.data('bs-action', action); // save action type
const isNew = action === 'new';
modal.find(`#${MODAL_ID}-label`).text(isNew ? 'Add New Parameter' : eventTarget.data('bs-param-name'));
modal.find(`#${MODAL_ID}-version`).text(getCurrentVersion()).toggle(isNew);
modal.find(`#${MODAL_ID}-version`).text(DEFAULT_VERSION).toggle(isNew);
modal.find(`#${MODAL_ID}-dropdowns`).toggle(isNew);
if (isNew) {
['Job Type', 'Task ID'].forEach(field => {
Expand All @@ -173,7 +163,7 @@ <h5 class="modal-title" id="param-modal-label"></h5>
const action = modal.data('bs-action');
let url;
if (action === "new") {
const version = getCurrentVersion();
const version = DEFAULT_VERSION;
const jobType = getValidatedInputValue('Job Type', modal);
const taskId = getValidatedInputValue('Task ID', modal);
const modality = MODALITY_TASKS.includes(taskId) ? getValidatedInputValue('Modality', modal) : null;
Expand All @@ -197,14 +187,6 @@ <h5 class="modal-title" id="param-modal-label"></h5>
$(`#${MODAL_ID}-modality-select`).on('change', function() {
handleExistingParam();
});
// Event listener for version dropdown
$('#version-dropdown .dropdown-item').on('click', function() {
var version = $(this).text();
if (version != getCurrentVersion()) {
$('#version-button').text(version);
$('#job-params-table').DataTable().ajax.url(`/api/${version}/parameters`).load();
}
});
});
// Create DataTable for job params table
function createJobParamsTable() {
Expand Down Expand Up @@ -259,12 +241,12 @@ <h5 class="modal-title" id="param-modal-label"></h5>
function renderParameterButton(data, type, row) {
if (type == 'display') {
return (
`<button type="button" class="btn btn-link btn-sm"
data-bs-toggle="modal"
`<button type="button" class="btn btn-link btn-sm"
data-bs-toggle="modal"
data-bs-target="#${MODAL_ID}"
data-bs-action="edit"
data-bs-param-name=${data}
data-bs-job-type=${row.job_type}
data-bs-param-name=${data}
data-bs-job-type=${row.job_type}
data-bs-task-id=${row.task_id}
data-bs-modality=${row.modality}
>${data}
Expand All @@ -280,7 +262,7 @@ <h5 class="modal-title" id="param-modal-label"></h5>
}
function getParamUrlFromParamName(paramName) {
const match = paramName.match(/job_types\/(v\d+)?\/?(.*)/);
const version = match && match[1] ? match[1] : 'v1';
const version = match && match[1] ? match[1] : DEFAULT_VERSION;
const cleanedParamName = match ? match[2] : paramName;
return `/api/${version}/parameters/job_types/${cleanedParamName}`;
}
Expand Down Expand Up @@ -338,7 +320,7 @@ <h5 class="modal-title" id="param-modal-label"></h5>
function handleExistingParam() {
let exists = false;
const modal = $(`#${MODAL_ID}`);
const version = getCurrentVersion();
const version = DEFAULT_VERSION
const jobType = getInputValues('Job Type', modal).input;
const taskId = getInputValues('Task ID', modal).input;
const modality = MODALITY_TASKS.includes(taskId) ? getInputValues('Modality', modal).input : null;
Expand Down Expand Up @@ -368,9 +350,6 @@ <h5 class="modal-title" id="param-modal-label"></h5>
}
}
// Helper methods to get current values
function getCurrentVersion() {
return $('#version-button').text().trim();
}
function getUniqueColumnValues(columnTitle) {
return Array.from(new Set($('#job-params-table').DataTable().column(`${columnTitle}:title`).data().toArray()));
}
Expand Down