HPC-9661: Set column names for caseload and indicators and add translations

html/modules/custom/ghi_blocks/src/Plugin/ConfigurationContainerItem/AttachmentLabel.php

@@ -6,6 +6,7 @@
 use Drupal\ghi_form_elements\ConfigurationContainerItemPluginBase;
 use Drupal\ghi_form_elements\Helpers\FormElementHelper;
 use Drupal\ghi_plans\ApiObjects\Attachments\AttachmentInterface;
+use Drupal\ghi_plans\ApiObjects\Attachments\DataAttachment;
 use Drupal\ghi_plans\Helpers\AttachmentHelper;
 
 /**
@@ -55,8 +56,16 @@ public function buildForm($element, FormStateInterface $form_state) {
    *   A default label.
    */
   public function getDefaultLabel() {
-    $configuration = $this->getPluginConfiguration();
-    return $configuration['default_label'] ?? $this->t('Attachment');
+    $attachment = $this->getContextValue('attachment');
+    $label = NULL;
+    if ($attachment && $attachment instanceof DataAttachment) {
+      $label = $attachment->getPrototype()?->getName();
+    }
+    if (!$label) {
+      $configuration = $this->getPluginConfiguration();
+      $label = $configuration['default_label'] ?? $this->t('Attachment');
+    }
+    return $label;
   }
 
   /**

html/modules/custom/ghi_blocks/src/Plugin/ConfigurationContainerItem/AttachmentTable.php

@@ -193,12 +193,11 @@ public function canAddNewItem() {
   public function getColumns(array $conf = NULL) {
     $conf = $conf ?? ($this->getConfig()['table_form'] ?? []);
     if (empty($conf['columns'])) {
-      $prototype = $this->getAttachmentPrototype();
       $conf['columns'] = [
         [
           'item_type' => 'attachment_label',
           'config' => [
-            'label' => $prototype?->getName() ?? (string) $this->t('Indicator'),
+            'label' => NULL,
           ],
         ],
       ];

html/modules/custom/ghi_plans/translations/es.po

@@ -66,4 +66,10 @@ msgid "Response plan"
 msgstr "Plan de respuesta"
 
 msgid "Projects"
-msgstr "Proyectos"
+msgstr "Proyectos"
+
+msgid "Caseload"
+msgstr "Datos de Población"
+
+msgid "Indicator"
+msgstr "Indicador"

html/modules/custom/ghi_plans/translations/fr.po

@@ -67,3 +67,9 @@ msgstr "Plan de réponse"
 
 msgid "Projects"
 msgstr "Projets"
+
+msgid "Caseload"
+msgstr "Données de population"
+
+msgid "Indicator"
+msgstr "Indicateur"

html/modules/custom/ghi_subpages/src/LogframeManager.php

@@ -401,7 +401,7 @@ private function buildCaseloadColumns(AttachmentPrototype $attachment_prototype,
     $columns[] = [
       'item_type' => 'attachment_label',
       'config' => [
-        'label' => $attachment_prototype->getName(),
+        'label' => NULL,
       ],
       'id' => 0,
     ];
@@ -486,13 +486,12 @@ private function buildCaseloadColumns(AttachmentPrototype $attachment_prototype,
    *   container items.
    */
   private function buildIndicatorColumns(AttachmentPrototype $attachment_prototype, Plan $plan) {
-
     $columns = [];
     // Setup the columns.
     $columns[] = [
       'item_type' => 'attachment_label',
       'config' => [
-        'label' => $attachment_prototype->getName(),
+        'label' => NULL,
       ],
       'id' => count($columns),
     ];

html/modules/custom/ghi_user/src/EventSubscriber/RemoveCheckLoggedIn.php

@@ -55,7 +55,12 @@ public function checkRequest(RequestEvent $event) {
     $query_args = $request->query->all();
     if (array_key_exists('check_logged_in', $query_args) && $this->currentUser->isAnonymous()) {
       unset($query_args['check_logged_in']);
-      $url = Url::createFromRequest($request);
+      try {
+        $url = Url::createFromRequest($request);
+      }
+      catch (\Exception $e) {
+        return;
+      }
       $url->setOption('query', $query_args);
       $event->setResponse(new CacheableRedirectResponse($url->toString()));
     }