Merge branch 'main' into VACMS-20086-manila-va-clinic-pathautoing

department-of-veterans-affairs · Dec 17, 2024 · 5d68ff6 · 5d68ff6
2 parents df34b45 + a968aef
commit 5d68ff6
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -231,7 +231,7 @@
         "symfony/phpunit-bridge": "^7.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3649",
+        "va-gov/content-build": "^0.0.3651",
         "vlucas/phpdotenv": "^5.6",
         "webflo/drupal-finder": "1.3.1",
         "webmozart/path-util": "^2.3",

diff --git a/composer.lock b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "dd345152975d6cc1a711538f328a1aff",
+    "content-hash": "aa992d810ef45398cacf8ee73a2a1bd9",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -26905,16 +26905,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3649",
+            "version": "v0.0.3651",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "56d9b5b3439bd31a4c640c007a37cf50ec19c4be"
+                "reference": "46e0d59db34626ec5a54fe7d07a44edc431320f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/56d9b5b3439bd31a4c640c007a37cf50ec19c4be",
-                "reference": "56d9b5b3439bd31a4c640c007a37cf50ec19c4be",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/46e0d59db34626ec5a54fe7d07a44edc431320f4",
+                "reference": "46e0d59db34626ec5a54fe7d07a44edc431320f4",
                 "shasum": ""
             },
             "type": "node-project",
@@ -26941,9 +26941,9 @@
             "description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
             "support": {
                 "issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
-                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3649"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3651"
             },
-            "time": "2024-12-12T21:20:03+00:00"
+            "time": "2024-12-16T18:37:47+00:00"
         },
         {
             "name": "vlucas/phpdotenv",

diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
@@ -48,8 +48,6 @@ module:
   csv_serialization: 0
   ctools: 0
   ctools_block: 0
-  danse: 0
-  danse_content_moderation: 0
   datetime: 0
   datetime_range: 0
   dblog: 0

diff --git a/config/sync/views.view.danse_user_notifications.yml b/config/sync/views.view.danse_user_notifications.yml
diff --git a/docroot/modules/custom/va_gov_db/va_gov_db.install b/docroot/modules/custom/va_gov_db/va_gov_db.install
@@ -1166,3 +1166,20 @@ function va_gov_db_update_9015(&$sandbox) {
     'va_gov_github',
   ]);
 }
+
+/**
+ * Truncate danse events table, remove broken view and uninstall danse modules.
+ */
+function va_gov_db_update_10001(): string {
+  // Remove the danse_event table.
+  Drupal::database()->truncate('danse_event')->execute();
+  Drupal::logger('va_gov_backend')->log(LogLevel::INFO, 'danse_event table truncated.');
+  // Remove the broken danse_user_notifications view.
+  Drupal::service('config.factory')->getEditable('views.view.danse_user_notifications')->delete();
+  Drupal::logger('va_gov_backend')->log(LogLevel::INFO, 'Deleted danse_user_notifications view.');
+  $uninstall_modules = [
+    'danse',
+    'danse_content_moderation',
+  ];
+  return _va_gov_db_uninstall_modules($uninstall_modules);
+}