Merge branch 'master' into VAGOV-0000-update-va-web

.github/ISSUE_TEMPLATE/cms-bug-report.md

@@ -1,11 +1,11 @@
 ---
-name: Bug report
+name: Defect report
 about: Create a report to help us improve
-title: "[CMS bug]  "
-labels: bug
+title: "<Defect summary>"
+labels: Defect
 assignees:
 ---
-**Describe the bug**
+**Describe the defect**
 A clear and concise description of what the bug is.
 
 **To Reproduce**
@@ -21,7 +21,7 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
+**Desktop (please complete the following information if relevant, or delete):**
  - OS: [e.g. iOS]
  - Browser [e.g. chrome, safari]
  - Version [e.g. 22]
@@ -31,7 +31,7 @@ Add any other context about the problem here.
 
 
 ## Labels
-- [/] Issue type (red) (defaults to bug)
+- [/] Issue type (red) (defaults to "Defect")
 - [ ] CMS subsystem (green)
 - [ ] CMS practice area (blue)
 - [/] CMS objective (orange) (not needed for bug tickets)

composer.json

@@ -240,7 +240,8 @@
                 "Bypass password requirement for password change if logged in with sso.": "https://www.drupal.org/files/issues/2018-05-01/simplesamlphp_auth-change-password-access-2968598-2.patch"
             },
             "drupal/tablefield": {
-                "0 string value in cell throws empty error": "https://www.drupal.org/files/issues/2019-12-10/0-value-throwing-empty-error.patch"
+                "0 string value in cell throws empty error": "https://www.drupal.org/files/issues/2019-12-10/0-value-throwing-empty-error.patch",
+                "Make tables draggable": "https://www.drupal.org/files/issues/2019-04-25/tablefield-tabledrag_support-3040358-4-D8.patch"
             },
             "drupal/textfield_counter": {
                 "Prevent form submission when character limit exceeded option does not work": "https://www.drupal.org/files/issues/2018-10-04/textfield_counter-prevent_form_submission_does_not_work-3004457-2.patch"

docroot/modules/custom/va_gov_backend/va_gov_backend.module

@@ -198,6 +198,10 @@ function va_gov_backend_menu_local_tasks_alter(&$local_tasks) {
     $local_tasks['tabs'][0]['entity.node.canonical']['#link']['title'] = 'View';
     $local_tasks['tabs'][0]['entity.node.canonical']['#link']['url'] = Url::fromUri('internal:/node/' . $nid);
   }
+  // Remove the history tab.
+  if (!empty($local_tasks['tabs'][0]['views_view:view.moderation_history.page'])) {
+    unset($local_tasks['tabs'][0]['views_view:view.moderation_history.page']);
+  }
 }
 
 /**

docroot/modules/custom/va_gov_build_trigger/va_gov_build_trigger.module

@@ -87,9 +87,17 @@ function va_gov_build_trigger_preprocess_page(&$variables) {
     // It's a node.
     $path = \Drupal::request()->getpathInfo();
     $arg = explode('/', $path);
-
-    // Make sure we aren't on the node form.
-    if (empty($arg[1]) || empty($arg[2]) || $arg[1] !== 'node' && !is_numeric($arg[2])) {
+    $exclusion_types = [
+      'outreach_asset',
+      'person_profile',
+      'support_service',
+      'regional_health_care_service_des',
+      'health_care_local_health_service',
+    ];
+    // Make sure we aren't on the node form or an excluded type.
+    $route_name = \Drupal::routeMatch()->getRouteName();
+    if (($route_name !== 'entity.node.edit_form') &&
+      (!in_array($node->bundle(), $exclusion_types))) {
       // Make sure we aren't on /training-guide.
       $current_uri = \Drupal::request()->getRequestUri();
       if ($current_uri !== '/training-guide') {

docroot/themes/custom/vagovadmin/templates/layout/fieldset.html.twig

@@ -0,0 +1,62 @@
+{#
+/**
+ * @file
+ * Theme override for a fieldset element and its children.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the fieldset element.
+ * - errors: (optional) Any errors for this fieldset element, may not be set.
+ * - required: Boolean indicating whether the fieldeset element is required.
+ * - legend: The legend element containing the following properties:
+ *   - title: Title of the fieldset, intended for use as the text of the legend.
+ *   - attributes: HTML attributes to apply to the legend.
+ * - description: The description element containing the following properties:
+ *   - content: The description content of the fieldset.
+ *   - attributes: HTML attributes to apply to the description container.
+ * - children: The rendered child elements of the fieldset.
+ * - prefix: The content to add before the fieldset children.
+ * - suffix: The content to add after the fieldset children.
+ *
+ * @see template_preprocess_fieldset()
+ */
+#}
+{%
+  set classes = [
+    'js-form-item',
+    'form-item',
+    'js-form-wrapper',
+    'form-wrapper',
+  ]
+%}
+<fieldset{{attributes.addClass(classes)}}>
+	{%
+    set legend_span_classes = [
+      'fieldset-legend',
+      required ? 'js-form-required',
+      required ? 'form-required',
+    ]
+  %}
+	{#  Always wrap fieldset legends in a <span> for CSS positioning. #}
+	<legend{{legend.attributes}}>
+		<span{{legend_span.attributes.addClass(legend_span_classes)}}>{{ legend.title }}</span>
+	</legend>
+	{% if description.content %}
+		<div{{description.attributes.addClass('description')}}>{{ description.content }}</div>
+	{% endif %}
+
+	<div class="fieldset-wrapper">
+		{% if errors %}
+			<div class="form-item--error-message">
+				<strong>{{ errors }}</strong>
+			</div>
+		{% endif %}
+		{% if prefix %}
+			<span class="field-prefix">{{ prefix }}</span>
+		{% endif %}
+		{{ children }}
+		{% if suffix %}
+			<span class="field-suffix">{{ suffix }}</span>
+		{% endif %}
+
+	</div>
+</fieldset>