Skip to content

Commit 664d758

Browse files
labkey-martyplabkey-martyp
authored
Link crawler fixes (#835)
* Fix some EHR admin page links * Add nonces to AnimalGroups.jsp and AnimalsHierarchy.jsp * Remove invalid lookups from edit lookups page
1 parent 8982cf9 commit 664d758

File tree

5 files changed

+55
-47
lines changed

5 files changed

+55
-47
lines changed

‎snprc_ehr/resources/views/ehrAdmin.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
{name: 'Set EHR Module Properties', url: '<%=contextPath%><%=containerPath%>/core-modulePropertyAdmin.view?moduleName=EHR'},
2121
{name: 'Configure SSRS Properties', url: '<%=contextPath%><%=containerPath%>/snprc_ehr-ssrsConfig.view'},
2222
{name: 'Update Study QCStates', url: '<%=contextPath%><%=containerPath%>/ehr-ensureQCStates.view'},
23-
{name: 'Verify Dataset Resources', url: '<%=contextPath%><%=containerPath%>/ehr-verifyDatasetResources.view}'},
24-
{name: 'Verify Dataset Columns', url: '<%=contextPath%><%=containerPath%>/snprc_ehr-validateDataSetCols.view'},
23+
{name: 'Verify Dataset Resources', url: '<%=contextPath%><%=containerPath%>/ehr-verifyDatasetResources.view'},
24+
{name: 'Verify Dataset Columns', url: '<%=contextPath%><%=containerPath%>/ehr-validateDataSetCols.view'},
2525
{name: 'Verify EHR Schema Indexes Are Compressed', url: '<%=contextPath%><%=containerPath%>/ehr-ensureEHRSchemaIndexes.view'},
2626
{name: 'Cache Demographics On All Living Animals', url: '<%=contextPath%><%=containerPath%>/ehr-cacheLivingAnimals.view'},
2727
{name: 'Cache Demographics On All Animals', url: '<%=contextPath%><%=containerPath%>/ehr-cacheLivingAnimals.view?includeAll=true'},

‎snprc_ehr/src/org/labkey/snprc_ehr/views/AnimalGroups.jsp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@
3030
<%
3131
HtmlString contextPath = getContextPath();
3232
%>
33-
<script src="<%= contextPath %>/snprc_ehr/lib/models/GroupCategoryModel.js"></script>
34-
<script src="<%= contextPath %>/snprc_ehr/lib/models/GroupMemberModel.js"></script>
33+
<script src="<%= contextPath %>/snprc_ehr/lib/models/GroupCategoryModel.js" nonce="<%=getScriptNonce()%>"></script>
34+
<script src="<%= contextPath %>/snprc_ehr/lib/models/GroupMemberModel.js" nonce="<%=getScriptNonce()%>"></script>
3535

36-
<script src="<%= contextPath %>/snprc_ehr/lib/stores/GroupCategoriesStore.js"></script>
37-
<script src="<%= contextPath %>/snprc_ehr/lib/stores/SpeciesStore.js"></script>
38-
<script src="<%= contextPath %>/snprc_ehr/lib/stores/AnimalGroupsStore.js"></script>
39-
<script src="<%= contextPath %>/snprc_ehr/lib/stores/AnimalsComboStore.js"></script>
40-
<script src="<%= contextPath %>/snprc_ehr/lib/stores/YesNoStore.js"></script>
41-
<script src="<%= contextPath %>/snprc_ehr/lib/stores/GenderStore.js"></script>
42-
<script src="<%= contextPath %>/snprc_ehr/lib/stores/GroupMembersStore.js"></script>
36+
<script src="<%= contextPath %>/snprc_ehr/lib/stores/GroupCategoriesStore.js" nonce="<%=getScriptNonce()%>"></script>
37+
<script src="<%= contextPath %>/snprc_ehr/lib/stores/SpeciesStore.js" nonce="<%=getScriptNonce()%>"></script>
38+
<script src="<%= contextPath %>/snprc_ehr/lib/stores/AnimalGroupsStore.js" nonce="<%=getScriptNonce()%>"></script>
39+
<script src="<%= contextPath %>/snprc_ehr/lib/stores/AnimalsComboStore.js" nonce="<%=getScriptNonce()%>"></script>
40+
<script src="<%= contextPath %>/snprc_ehr/lib/stores/YesNoStore.js" nonce="<%=getScriptNonce()%>"></script>
41+
<script src="<%= contextPath %>/snprc_ehr/lib/stores/GenderStore.js" nonce="<%=getScriptNonce()%>"></script>
42+
<script src="<%= contextPath %>/snprc_ehr/lib/stores/GroupMembersStore.js" nonce="<%=getScriptNonce()%>"></script>
4343

44-
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupCategoriesGridPanel.js"></script>
45-
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupCategoryFormPanel.js"></script>
46-
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupMembersGridPanel.js"></script>
47-
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupsGridPanel.js"></script>
44+
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupCategoriesGridPanel.js" nonce="<%=getScriptNonce()%>"></script>
45+
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupCategoryFormPanel.js" nonce="<%=getScriptNonce()%>"></script>
46+
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupMembersGridPanel.js" nonce="<%=getScriptNonce()%>"></script>
47+
<script src="<%= contextPath %>/snprc_ehr/lib/panels/GroupsGridPanel.js" nonce="<%=getScriptNonce()%>"></script>
4848

49-
<script src="<%= contextPath %>/snprc_ehr/lib/windows/AssignAnimalsToGroupWindow.js"></script>
49+
<script src="<%= contextPath %>/snprc_ehr/lib/windows/AssignAnimalsToGroupWindow.js" nonce="<%=getScriptNonce()%>"></script>
5050
<style>
5151
.trash-btn {
5252
background-image: url('<%=contextPath%>/snprc_ehr/lib/images/trash-bin.png');

‎snprc_ehr/src/org/labkey/snprc_ehr/views/AnimalsHierarchy.jsp‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -44,36 +44,36 @@
4444
4545
</script>
4646

47-
<script src="<%= contextPath %>/LDK/Utils.js"></script>
48-
<script src="<%= contextPath %>/LDK/Assert.js"></script>
49-
<script src="<%= contextPath %>/snprc_ehr/lib/stores/AnimalsByNodeTreeStore.js"></script>
50-
<script src="<%= contextPath %>/snprc_ehr/lib/panels/AnimalsByNodeTreePanel.js"></script>
51-
<script src="<%= contextPath %>/snprc_ehr/lib/panels/AnimalsByNodeReportsContainer.js"></script>
52-
<script src="<%= contextPath %>/LDK/panel/ContentResizingPanel.js"></script>
53-
<script src="<%= contextPath %>/LDK/ConvertUtils.js"></script>
54-
<script src="<%= contextPath %>/LDK/QueryHelper.js"></script>
55-
<script src="<%= contextPath %>/LDK/SelectRowsRow.js"></script>
56-
<script src="<%= contextPath %>/LDK/panel/QueryPanel.js"></script>
57-
<script src="<%= contextPath %>/LDK/field/NumberField.js"></script>
58-
<script src="<%= contextPath %>/LDK/panel/WebpartPanel.js"></script>
59-
<script src="<%= contextPath %>/LDK/panel/GraphPanel.js"></script>
60-
<script src="<%= contextPath %>/ehr/data/ClinicalHistoryStore.js"></script>
61-
<script src="<%= contextPath %>/ehr/panel/ClinicalHistoryPanel.js"></script>
62-
<script src="<%= contextPath %>/ehr/panel/SnapshotPanel.js"></script>
63-
<script src="<%= contextPath %>/ehr/panel/SmallFormSnapshotPanel.js"></script>
47+
<script src="<%= contextPath %>/LDK/Utils.js" nonce="<%=getScriptNonce()%>"></script>
48+
<script src="<%= contextPath %>/LDK/Assert.js" nonce="<%=getScriptNonce()%>"></script>
49+
<script src="<%= contextPath %>/snprc_ehr/lib/stores/AnimalsByNodeTreeStore.js" nonce="<%=getScriptNonce()%>"></script>
50+
<script src="<%= contextPath %>/snprc_ehr/lib/panels/AnimalsByNodeTreePanel.js" nonce="<%=getScriptNonce()%>"></script>
51+
<script src="<%= contextPath %>/snprc_ehr/lib/panels/AnimalsByNodeReportsContainer.js" nonce="<%=getScriptNonce()%>"></script>
52+
<script src="<%= contextPath %>/LDK/panel/ContentResizingPanel.js" nonce="<%=getScriptNonce()%>"></script>
53+
<script src="<%= contextPath %>/LDK/ConvertUtils.js" nonce="<%=getScriptNonce()%>"></script>
54+
<script src="<%= contextPath %>/LDK/QueryHelper.js" nonce="<%=getScriptNonce()%>"></script>
55+
<script src="<%= contextPath %>/LDK/SelectRowsRow.js" nonce="<%=getScriptNonce()%>"></script>
56+
<script src="<%= contextPath %>/LDK/panel/QueryPanel.js" nonce="<%=getScriptNonce()%>"></script>
57+
<script src="<%= contextPath %>/LDK/field/NumberField.js" nonce="<%=getScriptNonce()%>"></script>
58+
<script src="<%= contextPath %>/LDK/panel/WebpartPanel.js" nonce="<%=getScriptNonce()%>"></script>
59+
<script src="<%= contextPath %>/LDK/panel/GraphPanel.js" nonce="<%=getScriptNonce()%>"></script>
60+
<script src="<%= contextPath %>/ehr/data/ClinicalHistoryStore.js" nonce="<%=getScriptNonce()%>"></script>
61+
<script src="<%= contextPath %>/ehr/panel/ClinicalHistoryPanel.js" nonce="<%=getScriptNonce()%>"></script>
62+
<script src="<%= contextPath %>/ehr/panel/SnapshotPanel.js" nonce="<%=getScriptNonce()%>"></script>
63+
<script src="<%= contextPath %>/ehr/panel/SmallFormSnapshotPanel.js" nonce="<%=getScriptNonce()%>"></script>
6464

65-
<script src="<%= contextPath %>/ehr/panel/WeightSummaryPanel.js"></script>
66-
<script src="<%= contextPath %>/ehr/panel/WeightGraphPanel.js"></script>
67-
<script src="<%= contextPath %>/ehr/utils.js"></script>
68-
<script src="<%= contextPath %>/ehr/DemographicsCache.js"></script>
69-
<script src="<%= contextPath %>/ehr/panel/KinShipPanel.js"></script>
70-
<script src="<%= contextPath %>/LDK/panel/DetailsPanel.js"></script>
71-
<script src="<%= contextPath %>/LDK/panel/MultiRecordDetailsPanel.js"></script>
72-
<script src="<%= contextPath %>/ehr/panel/BloodSummaryPanel.js"></script>
73-
<script src="<%= contextPath %>/snprc_ehr/Panel/BloodSummaryPanel.js"></script>
74-
<script src="<%= contextPath %>/snprc_ehr/Panel/ClinicalHistoryPanel.js"></script>
75-
<script src="<%= contextPath %>/snprc_ehr/DemographicsRecord.js"></script>
76-
<script src="<%= contextPath %>/snprc_ehr/snprcOverrides.js"></script>
65+
<script src="<%= contextPath %>/ehr/panel/WeightSummaryPanel.js" nonce="<%=getScriptNonce()%>"></script>
66+
<script src="<%= contextPath %>/ehr/panel/WeightGraphPanel.js" nonce="<%=getScriptNonce()%>"></script>
67+
<script src="<%= contextPath %>/ehr/utils.js" nonce="<%=getScriptNonce()%>"></script>
68+
<script src="<%= contextPath %>/ehr/DemographicsCache.js" nonce="<%=getScriptNonce()%>"></script>
69+
<script src="<%= contextPath %>/ehr/panel/KinShipPanel.js" nonce="<%=getScriptNonce()%>"></script>
70+
<script src="<%= contextPath %>/LDK/panel/DetailsPanel.js" nonce="<%=getScriptNonce()%>"></script>
71+
<script src="<%= contextPath %>/LDK/panel/MultiRecordDetailsPanel.js" nonce="<%=getScriptNonce()%>"></script>
72+
<script src="<%= contextPath %>/ehr/panel/BloodSummaryPanel.js" nonce="<%=getScriptNonce()%>"></script>
73+
<script src="<%= contextPath %>/snprc_ehr/Panel/BloodSummaryPanel.js" nonce="<%=getScriptNonce()%>"></script>
74+
<script src="<%= contextPath %>/snprc_ehr/Panel/ClinicalHistoryPanel.js" nonce="<%=getScriptNonce()%>"></script>
75+
<script src="<%= contextPath %>/snprc_ehr/DemographicsRecord.js" nonce="<%=getScriptNonce()%>"></script>
76+
<script src="<%= contextPath %>/snprc_ehr/snprcOverrides.js" nonce="<%=getScriptNonce()%>"></script>
7777

7878
<style>
7979
.x4-grid-tree-node-expanded .location .x4-tree-icon-parent, .location .x4-tree-icon-parent {

‎snprc_ehr/src/org/labkey/snprc_ehr/views/EditLookupTables.jsp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393
{queryName: 'drug_categories', schemaName: 'ehr_lookups', title: 'Drug Categories'},
9494
{queryName: 'conc_units', schemaName: 'ehr_lookups', title: 'Drug Concentration Units'},
9595
{queryName: 'dosage_units', schemaName: 'ehr_lookups', title: 'Drug Dosage Units'},
96-
{queryName: 'ValidDSGroup', schemaName: 'ehr_lookups', title: 'Diagnosis Groups'},
97-
{queryName: 'ValidDXList', schemaName: 'ehr_lookups', title: 'Diagnosis Lists'},
96+
// {queryName: 'ValidDSGroup', schemaName: 'ehr_lookups', title: 'Diagnosis Groups'},
97+
// {queryName: 'ValidDXList', schemaName: 'ehr_lookups', title: 'Diagnosis Lists'},
9898
{queryName: 'volume_units', schemaName: 'ehr_lookups', title: 'Drug Volume Units'},
9999
//{queryName: 'drug_defaults', schemaName: 'ehr_lookups', title: 'Drug Default Values'},
100100
{queryName: 'routes', schemaName: 'ehr_lookups', title: 'Drug Routes'},

‎snprc_ehr/test/src/org/labkey/test/tests/snprc_ehr/SNPRC_EHRTest.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,14 @@ protected void importStudy()
267267
importFolderFromPath(++_pipelineJobCount);
268268
}
269269

270+
@Override
271+
protected List<String> skipLinksForValidation()
272+
{
273+
List<String> links = new ArrayList<>(super.skipLinksForValidation());
274+
links.add("snprc_ehr-BirthReport.view"); // Not currently rendering in test project
275+
return links;
276+
}
277+
270278
protected void initSND()
271279
{
272280
goToProjectHome();

0 commit comments

Comments
 (0)