Skip to content

Link crawler fixes #835

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
labkey-martyp merged 2 commits into from
Aug 3, 2025
Merged

Link crawler fixes #835

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
45a5b74
Link crawler fixes
labkey-martyp Jul 20, 2025
90c45da
comment
labkey-martyp Jul 30, 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
4 changes: 2 additions & 2 deletions snprc_ehr/resources/views/ehrAdmin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
{name: 'Set EHR Module Properties', url: '<%=contextPath%><%=containerPath%>/core-modulePropertyAdmin.view?moduleName=EHR'},
{name: 'Configure SSRS Properties', url: '<%=contextPath%><%=containerPath%>/snprc_ehr-ssrsConfig.view'},
{name: 'Update Study QCStates', url: '<%=contextPath%><%=containerPath%>/ehr-ensureQCStates.view'},
{name: 'Verify Dataset Resources', url: '<%=contextPath%><%=containerPath%>/ehr-verifyDatasetResources.view}'},
{name: 'Verify Dataset Columns', url: '<%=contextPath%><%=containerPath%>/snprc_ehr-validateDataSetCols.view'},
{name: 'Verify Dataset Resources', url: '<%=contextPath%><%=containerPath%>/ehr-verifyDatasetResources.view'},
{name: 'Verify Dataset Columns', url: '<%=contextPath%><%=containerPath%>/ehr-validateDataSetCols.view'},
{name: 'Verify EHR Schema Indexes Are Compressed', url: '<%=contextPath%><%=containerPath%>/ehr-ensureEHRSchemaIndexes.view'},
{name: 'Cache Demographics On All Living Animals', url: '<%=contextPath%><%=containerPath%>/ehr-cacheLivingAnimals.view'},
{name: 'Cache Demographics On All Animals', url: '<%=contextPath%><%=containerPath%>/ehr-cacheLivingAnimals.view?includeAll=true'},
Expand Down
28 changes: 14 additions & 14 deletions snprc_ehr/src/org/labkey/snprc_ehr/views/AnimalGroups.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,23 @@
<%
HtmlString contextPath = getContextPath();
%>
<script src="<%= contextPath %>/snprc_ehr/lib/models/GroupCategoryModel.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/models/GroupMemberModel.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/models/GroupCategoryModel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/models/GroupMemberModel.js" nonce="<%=getScriptNonce()%>"></script>

<script src="<%= contextPath %>/snprc_ehr/lib/stores/GroupCategoriesStore.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/SpeciesStore.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/AnimalGroupsStore.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/AnimalsComboStore.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/YesNoStore.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/GenderStore.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/GroupMembersStore.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/GroupCategoriesStore.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/SpeciesStore.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/AnimalGroupsStore.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/AnimalsComboStore.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/YesNoStore.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/GenderStore.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/GroupMembersStore.js" nonce="<%=getScriptNonce()%>"></script>

<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupCategoriesGridPanel.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupCategoryFormPanel.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupMembersGridPanel.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupsGridPanel.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupCategoriesGridPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupCategoryFormPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupMembersGridPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupsGridPanel.js" nonce="<%=getScriptNonce()%>"></script>

<script src="<%= contextPath %>/snprc_ehr/lib/windows/AssignAnimalsToGroupWindow.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/windows/AssignAnimalsToGroupWindow.js" nonce="<%=getScriptNonce()%>"></script>
<style>
.trash-btn {
background-image: url('<%=contextPath%>/snprc_ehr/lib/images/trash-bin.png');
Expand Down
58 changes: 29 additions & 29 deletions snprc_ehr/src/org/labkey/snprc_ehr/views/AnimalsHierarchy.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,36 +44,36 @@

</script>

<script src="<%= contextPath %>/LDK/Utils.js"></script>
<script src="<%= contextPath %>/LDK/Assert.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/AnimalsByNodeTreeStore.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/panels/AnimalsByNodeTreePanel.js"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/panels/AnimalsByNodeReportsContainer.js"></script>
<script src="<%= contextPath %>/LDK/panel/ContentResizingPanel.js"></script>
<script src="<%= contextPath %>/LDK/ConvertUtils.js"></script>
<script src="<%= contextPath %>/LDK/QueryHelper.js"></script>
<script src="<%= contextPath %>/LDK/SelectRowsRow.js"></script>
<script src="<%= contextPath %>/LDK/panel/QueryPanel.js"></script>
<script src="<%= contextPath %>/LDK/field/NumberField.js"></script>
<script src="<%= contextPath %>/LDK/panel/WebpartPanel.js"></script>
<script src="<%= contextPath %>/LDK/panel/GraphPanel.js"></script>
<script src="<%= contextPath %>/ehr/data/ClinicalHistoryStore.js"></script>
<script src="<%= contextPath %>/ehr/panel/ClinicalHistoryPanel.js"></script>
<script src="<%= contextPath %>/ehr/panel/SnapshotPanel.js"></script>
<script src="<%= contextPath %>/ehr/panel/SmallFormSnapshotPanel.js"></script>
<script src="<%= contextPath %>/LDK/Utils.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/LDK/Assert.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/stores/AnimalsByNodeTreeStore.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/panels/AnimalsByNodeTreePanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/lib/panels/AnimalsByNodeReportsContainer.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/LDK/panel/ContentResizingPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/LDK/ConvertUtils.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/LDK/QueryHelper.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/LDK/SelectRowsRow.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/LDK/panel/QueryPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/LDK/field/NumberField.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/LDK/panel/WebpartPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/LDK/panel/GraphPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/ehr/data/ClinicalHistoryStore.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/ehr/panel/ClinicalHistoryPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/ehr/panel/SnapshotPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/ehr/panel/SmallFormSnapshotPanel.js" nonce="<%=getScriptNonce()%>"></script>

<script src="<%= contextPath %>/ehr/panel/WeightSummaryPanel.js"></script>
<script src="<%= contextPath %>/ehr/panel/WeightGraphPanel.js"></script>
<script src="<%= contextPath %>/ehr/utils.js"></script>
<script src="<%= contextPath %>/ehr/DemographicsCache.js"></script>
<script src="<%= contextPath %>/ehr/panel/KinShipPanel.js"></script>
<script src="<%= contextPath %>/LDK/panel/DetailsPanel.js"></script>
<script src="<%= contextPath %>/LDK/panel/MultiRecordDetailsPanel.js"></script>
<script src="<%= contextPath %>/ehr/panel/BloodSummaryPanel.js"></script>
<script src="<%= contextPath %>/snprc_ehr/Panel/BloodSummaryPanel.js"></script>
<script src="<%= contextPath %>/snprc_ehr/Panel/ClinicalHistoryPanel.js"></script>
<script src="<%= contextPath %>/snprc_ehr/DemographicsRecord.js"></script>
<script src="<%= contextPath %>/snprc_ehr/snprcOverrides.js"></script>
<script src="<%= contextPath %>/ehr/panel/WeightSummaryPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/ehr/panel/WeightGraphPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/ehr/utils.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/ehr/DemographicsCache.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/ehr/panel/KinShipPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/LDK/panel/DetailsPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/LDK/panel/MultiRecordDetailsPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/ehr/panel/BloodSummaryPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/Panel/BloodSummaryPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/Panel/ClinicalHistoryPanel.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/DemographicsRecord.js" nonce="<%=getScriptNonce()%>"></script>
<script src="<%= contextPath %>/snprc_ehr/snprcOverrides.js" nonce="<%=getScriptNonce()%>"></script>

<style>
.x4-grid-tree-node-expanded .location .x4-tree-icon-parent, .location .x4-tree-icon-parent {
Expand Down
4 changes: 2 additions & 2 deletions snprc_ehr/src/org/labkey/snprc_ehr/views/EditLookupTables.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@
{queryName: 'drug_categories', schemaName: 'ehr_lookups', title: 'Drug Categories'},
{queryName: 'conc_units', schemaName: 'ehr_lookups', title: 'Drug Concentration Units'},
{queryName: 'dosage_units', schemaName: 'ehr_lookups', title: 'Drug Dosage Units'},
{queryName: 'ValidDSGroup', schemaName: 'ehr_lookups', title: 'Diagnosis Groups'},
{queryName: 'ValidDXList', schemaName: 'ehr_lookups', title: 'Diagnosis Lists'},
// {queryName: 'ValidDSGroup', schemaName: 'ehr_lookups', title: 'Diagnosis Groups'},
// {queryName: 'ValidDXList', schemaName: 'ehr_lookups', title: 'Diagnosis Lists'},
{queryName: 'volume_units', schemaName: 'ehr_lookups', title: 'Drug Volume Units'},
//{queryName: 'drug_defaults', schemaName: 'ehr_lookups', title: 'Drug Default Values'},
{queryName: 'routes', schemaName: 'ehr_lookups', title: 'Drug Routes'},
Expand Down
8 changes: 8 additions & 0 deletions snprc_ehr/test/src/org/labkey/test/tests/snprc_ehr/SNPRC_EHRTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,14 @@ protected void importStudy()
importFolderFromPath(++_pipelineJobCount);
}

@Override
protected List<String> skipLinksForValidation()
{
List<String> links = new ArrayList<>(super.skipLinksForValidation());
links.add("snprc_ehr-BirthReport.view"); // Not currently rendering in test project
return links;
}

protected void initSND()
{
goToProjectHome();
Expand Down