Merge pull request #1949 from USGS-WiM/staging

Release v4.19.4 Staging into Master
USGS-WiM · Feb 8, 2024 · 155ed24 · 155ed24
2 parents 53f4d96 + 374bd63
commit 155ed24
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Security
 
+## [v4.19.4](https://github.com/USGS-WiM/StreamStats/releases/tag/v4.19.4) - 2024-02-08
+
+### Added
+
+- BP informational tool tip for Drupal article
+
+### Fixed
+
+- Fixed broken links in the sidebar
+- Duplicate stream grids in the "Download Stream Grids" tab when clicking the link from the "Submit Batch" tab
+
 ## [v4.19.3](https://github.com/USGS-WiM/StreamStats/releases/tag/v4.19.3) - 2023-01-04
 
 ### Added

diff --git a/code.json b/code.json
@@ -3,7 +3,7 @@
     "name": "StreamStats",
     "organization": "U.S. Geological Survey",
     "description": "StreamStats client application",
-    "version": "4.19.3",
+    "version": "4.19.4",
     "status": "Production",	
 
     "permissions": {
@@ -46,7 +46,7 @@
     },
 
     "date": {
-      "metadataLastUpdated": "2024-01-04"
+      "metadataLastUpdated": "2024-02-08"
     }
   }
 ]
diff --git a/dist/Views/batchprocessor.html b/dist/Views/batchprocessor.html
@@ -6,11 +6,10 @@
         &times;
     </button>
     <h4 class="modal-title">StreamStats Batch Processor&nbsp;&nbsp;
-        <!-- ADD THIS BACK ONCE DRUPAL PAGE IS READY -->
-        <!-- <i ng-click = "showTooltip1=!showTooltip1" class="fa fa-question-circle"></i>
+        <i ng-click="showTooltip1 =! showTooltip1" ng-mouseover="showTooltip1 = true" ng-mouseleave="showTooltip1 = false" class="fa fa-info-circle"></i>
         <span ng-show="showTooltip1" class="report-tooltip">
             For more information, see our <a href="https://www.usgs.gov/streamstats/streamstats-batch-processing-tool">Batch Processor Information page</a>.
-        </span> -->
+        </span>
     </h4>
 </div>
 <!-- End modal header -->
@@ -61,7 +60,7 @@ <h4 class="modal-title">StreamStats Batch Processor&nbsp;&nbsp;
                 <ol>
                     <li>Create a point shapefile:</li>
                     <ul style="list-style-type: disc; padding: 0px">
-                        <li>Ensure points are coincident with the stream grid used by StreamStats for delineation. Visit the<a ng-click="vm.selectBatchProcessorTab('streamGrid'); vm.loadStreamGrids(); vm.retrievingStreamGrids = true;" href="">Download Stream Grids tab</a>to download the stream grid for each State/Region.</li>
+                        <li>Ensure points are coincident with the stream grid used by StreamStats for delineation. Visit the<a ng-click="vm.selectBatchProcessorTab('streamGrid');" href="">Download Stream Grids tab</a>to download the stream grid for each State/Region.</li>
                         <li>Shapefile must have an ID field that uniquely identifies each point. </li>
                         <li>Shapefile must be a point shapefile. Polyline, polygon, and multipoint geometries cannot be
                             processed.
@@ -98,7 +97,7 @@ <h4 class="modal-title">StreamStats Batch Processor&nbsp;&nbsp;
             <div style="padding-top: 15px">
                 <!-- Start idfield -->
                 <div> ID Field:
-                    <i ng-mouseover="showTooltip2 = true" ng-mouseleave="showTooltip2 = false"
+                    <i ng-click="showTooltip2 =! showTooltip2" ng-mouseover="showTooltip2 = true" ng-mouseleave="showTooltip2 = false"
                         class="fa fa-question-circle"></i>
                     <span ng-show="showTooltip2" class="report-tooltip">
                         <span>This is the field heading from the shapefile of points that is unique to each point and

diff --git a/dist/Views/sidebarview.html b/dist/Views/sidebarview.html
@@ -295,11 +295,11 @@ <h5>Supported search strings:</h5>
         <div class="sidebar-footer">
             <a href="https://usgs.gov/" target="_blank">USGS Home</a>
             <a href="https://answers.usgs.gov/" target="_blank">Contact USGS</a>
-            <a href="https://search.usgs.gov/" target="_blank">Search USGS</a>
-            <a href="https://www2.usgs.gov/laws/accessibility.html" target="_blank">Accessibility</a>
-            <a href="https://www2.usgs.gov/foia/" target="_blank">FOIA</a>
-            <a href="https://www2.usgs.gov/laws/privacy.html" target="_blank">Privacy</a>
-            <a href="https://www2.usgs.gov/laws/policies_notices.html" target="_blank">Policy & Notices</a>
+            <a href="https://www.usgs.gov/search" target="_blank">Search USGS</a>
+            <a href="https://www.usgs.gov/accessibility" target="_blank">Accessibility</a>
+            <a href="https://www.usgs.gov/foia" target="_blank">FOIA</a>
+            <a href="https://www.usgs.gov/office-of-the-director/privacy-policies" target="_blank">Privacy</a>
+            <a href="https://www.usgs.gov/policies-notices" target="_blank">Policy & Notices</a>
         </div>
     </div>
 </div>
diff --git a/dist/appConfig.js b/dist/appConfig.js
@@ -1,5 +1,5 @@
 var configuration = {};
-configuration.version = "4.19.3";
+configuration.version = "4.19.4";
 configuration.environment = 'development';
 configuration.showWarningModal = false;
 configuration.warningModalMessage = "Due to heavy demand, StreamStats is currently experiencing system interruptions. If you receive errors, please try back again later.<br><br>Thank you for your patience."

diff --git a/dist/appConfig_dev.js b/dist/appConfig_dev.js
@@ -1,5 +1,5 @@
 var configuration = {};
-configuration.version = "4.19.3";
+configuration.version = "4.19.4";
 configuration.environment = 'development';
 configuration.showWarningModal = false;
 configuration.warningModalMessage = "Due to heavy demand, StreamStats is currently experiencing system interruptions. If you receive errors, please try back again later.<br><br>Thank you for your patience."

diff --git a/dist/appConfig_test.js b/dist/appConfig_test.js
@@ -1,5 +1,5 @@
 var configuration = {};
-configuration.version = "4.19.3";
+configuration.version = "4.19.4";
 configuration.environment = 'development';
 configuration.showWarningModal = false;
 configuration.warningModalMessage = "Due to heavy demand, StreamStats is currently experiencing system interruptions. If you receive errors, please try back again later.<br><br>Thank you for your patience."

diff --git a/dist/scripts/vendor.min.js b/dist/scripts/vendor.min.js
diff --git a/src/Views/batchprocessor.html b/src/Views/batchprocessor.html
@@ -6,11 +6,10 @@
         &times;
     </button>
     <h4 class="modal-title">StreamStats Batch Processor&nbsp;&nbsp;
-        <!-- ADD THIS BACK ONCE DRUPAL PAGE IS READY -->
-        <!-- <i ng-click = "showTooltip1=!showTooltip1" class="fa fa-question-circle"></i>
+        <i ng-click="showTooltip1 =! showTooltip1" ng-mouseover="showTooltip1 = true" ng-mouseleave="showTooltip1 = false" class="fa fa-info-circle"></i>
         <span ng-show="showTooltip1" class="report-tooltip">
             For more information, see our <a href="https://www.usgs.gov/streamstats/streamstats-batch-processing-tool">Batch Processor Information page</a>.
-        </span> -->
+        </span>
     </h4>
 </div>
 <!-- End modal header -->
@@ -61,7 +60,7 @@ <h4 class="modal-title">StreamStats Batch Processor&nbsp;&nbsp;
                 <ol>
                     <li>Create a point shapefile:</li>
                     <ul style="list-style-type: disc; padding: 0px">
-                        <li>Ensure points are coincident with the stream grid used by StreamStats for delineation. Visit the<a ng-click="vm.selectBatchProcessorTab('streamGrid'); vm.loadStreamGrids(); vm.retrievingStreamGrids = true;" href="">Download Stream Grids tab</a>to download the stream grid for each State/Region.</li>
+                        <li>Ensure points are coincident with the stream grid used by StreamStats for delineation. Visit the<a ng-click="vm.selectBatchProcessorTab('streamGrid');" href="">Download Stream Grids tab</a>to download the stream grid for each State/Region.</li>
                         <li>Shapefile must have an ID field that uniquely identifies each point. </li>
                         <li>Shapefile must be a point shapefile. Polyline, polygon, and multipoint geometries cannot be
                             processed.
@@ -98,7 +97,7 @@ <h4 class="modal-title">StreamStats Batch Processor&nbsp;&nbsp;
             <div style="padding-top: 15px">
                 <!-- Start idfield -->
                 <div> ID Field:
-                    <i ng-mouseover="showTooltip2 = true" ng-mouseleave="showTooltip2 = false"
+                    <i ng-click="showTooltip2 =! showTooltip2" ng-mouseover="showTooltip2 = true" ng-mouseleave="showTooltip2 = false"
                         class="fa fa-question-circle"></i>
                     <span ng-show="showTooltip2" class="report-tooltip">
                         <span>This is the field heading from the shapefile of points that is unique to each point and

diff --git a/src/Views/sidebarview.html b/src/Views/sidebarview.html
@@ -295,11 +295,11 @@ <h5>Supported search strings:</h5>
         <div class="sidebar-footer">
             <a href="https://usgs.gov/" target="_blank">USGS Home</a>
             <a href="https://answers.usgs.gov/" target="_blank">Contact USGS</a>
-            <a href="https://search.usgs.gov/" target="_blank">Search USGS</a>
-            <a href="https://www2.usgs.gov/laws/accessibility.html" target="_blank">Accessibility</a>
-            <a href="https://www2.usgs.gov/foia/" target="_blank">FOIA</a>
-            <a href="https://www2.usgs.gov/laws/privacy.html" target="_blank">Privacy</a>
-            <a href="https://www2.usgs.gov/laws/policies_notices.html" target="_blank">Policy & Notices</a>
+            <a href="https://www.usgs.gov/search" target="_blank">Search USGS</a>
+            <a href="https://www.usgs.gov/accessibility" target="_blank">Accessibility</a>
+            <a href="https://www.usgs.gov/foia" target="_blank">FOIA</a>
+            <a href="https://www.usgs.gov/office-of-the-director/privacy-policies" target="_blank">Privacy</a>
+            <a href="https://www.usgs.gov/policies-notices" target="_blank">Policy & Notices</a>
         </div>
     </div>
 </div>
diff --git a/src/appConfig.js b/src/appConfig.js
@@ -1,5 +1,5 @@
 var configuration = {};
-configuration.version = "4.19.3";
+configuration.version = "4.19.4";
 configuration.environment = 'development';
 configuration.showWarningModal = false;
 configuration.warningModalMessage = "Due to heavy demand, StreamStats is currently experiencing system interruptions. If you receive errors, please try back again later.<br><br>Thank you for your patience."

diff --git a/src/appConfig_dev.js b/src/appConfig_dev.js
@@ -1,5 +1,5 @@
 var configuration = {};
-configuration.version = "4.19.3";
+configuration.version = "4.19.4";
 configuration.environment = 'development';
 configuration.showWarningModal = false;
 configuration.warningModalMessage = "Due to heavy demand, StreamStats is currently experiencing system interruptions. If you receive errors, please try back again later.<br><br>Thank you for your patience."

diff --git a/src/appConfig_test.js b/src/appConfig_test.js
@@ -1,5 +1,5 @@
 var configuration = {};
-configuration.version = "4.19.3";
+configuration.version = "4.19.4";
 configuration.environment = 'development';
 configuration.showWarningModal = false;
 configuration.warningModalMessage = "Due to heavy demand, StreamStats is currently experiencing system interruptions. If you receive errors, please try back again later.<br><br>Thank you for your patience."