Merge pull request #961 from UN-OCHA/RW-1142

[RW-1142] Decommission DSR
UN-OCHA · Dec 10, 2024 · f9f2977 · f9f2977
2 parents b71f12b + 955969b
commit f9f2977
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 160 deletions.
diff --git a/config/core.extension.yml b/config/core.extension.yml
@@ -77,7 +77,6 @@ module:
   reliefweb_bookmarks: 0
   reliefweb_contact: 0
   reliefweb_disaster_map: 0
-  reliefweb_dsr: 0
   reliefweb_entities: 0
   reliefweb_fields: 0
   reliefweb_files: 0

diff --git a/config/reliefweb_dsr.settings.yml b/config/reliefweb_dsr.settings.yml
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Country.php b/html/modules/custom/reliefweb_entities/src/Entity/Country.php
@@ -57,7 +57,6 @@ public function getPageContent() {
    */
   public function getPageSections() {
     $sections = [];
-    $sections['digital-sitrep'] = $this->getDigitalSitrepSection();
 
     $queries = [];
 
@@ -121,20 +120,6 @@ public function getPageTableOfContents() {
     ];
   }
 
-  /**
-   * Get the Digital Situation Report for the country.
-   *
-   * @return array
-   *   Render array for the Digital Situation Report section.
-   */
-  protected function getDigitalSitrepSection() {
-    $client = \Drupal::service('reliefweb_dsr.client');
-    $iso3 = $this->field_iso3->value;
-    $ongoing = $this->getModerationStatus() === 'ongoing';
-
-    return $client->getDigitalSitrepBuild($iso3, $ongoing);
-  }
-
   /**
    * {@inheritdoc}
    */

diff --git a/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php b/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
@@ -1156,14 +1156,6 @@ protected function generateEmailContentOchaSitrep(array $subscription, array $da
         ],
       ],
     ];
-    // Add link to Digital sitrep if there is one.
-    $dsr_url = $this->config('reliefweb_dsr')->get('ocha_dsr_url');
-    if (!empty($dsr_url) && isset($data['origin']) && strpos($data['origin'], $dsr_url) === 0) {
-      array_unshift($prefooter_parts, [
-        'text' => 'Digital Situation Report for ' . $country_name,
-        'link' => $data['origin'],
-      ]);
-    }
     $variables['#prefooter'] = $this->prepareFooterLinks($prefooter_parts, $subscription);
 
     return $variables;

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -171,11 +171,6 @@ rw-document:
     theme:
       components/rw-document/rw-document.css: {}
 
-rw-dsr:
-  css:
-    theme:
-      components/rw-dsr/rw-dsr.css: {}
-
 rw-entity-meta:
   css:
     theme:

diff --git a/html/themes/custom/common_design_subtheme/components/rw-dsr/README.md b/html/themes/custom/common_design_subtheme/components/rw-dsr/README.md
diff --git a/html/themes/custom/common_design_subtheme/components/rw-dsr/rw-dsr.css b/html/themes/custom/common_design_subtheme/components/rw-dsr/rw-dsr.css
diff --git a/..._subtheme/templates/rw-modules/reliefweb_dsr/reliefweb-digital-situation-report.html.twig b/..._subtheme/templates/rw-modules/reliefweb_dsr/reliefweb-digital-situation-report.html.twig
-Original file line number
+Diff line change
@@ Expand Up / @@ -171,11 +171,6 @@ rw-document: @@
         theme:
           components/rw-document/rw-document.css: {}
-    rw-dsr:
-      css:
-        theme:
-          components/rw-dsr/rw-dsr.css: {}
     rw-entity-meta:
       css:
         theme:
@@ Expand Down @@