NGSTACK-991 update logic in 'VisibilityInfo' controller for determining if location is hidden and update message text

Author: Ante Prkacin

bundle/Controller/Content/VisibilityInfo.php

@@ -28,44 +28,61 @@ public function __invoke(int $contentId, Request $request): Response
 
         if ($content->getContentInfo()->isHidden() === true) {
             $title = $this->translator->trans('content.visibility.content_hidden', [], 'locationview');
-        } else {
-            try {
-                $locations = $this->locationService->loadLocations($content->getContentInfo());
+        }
+
+        try {
+            $locations = $this->locationService->loadLocations($content->getContentInfo());
 
-                $hiddenLocations = 0;
-                foreach ($locations as $location) {
-                    if ($location->explicitlyHidden || $location->invisible) {
-                        $hiddenLocations++;
-                    }
+            $hiddenLocations = 0;
+            $hiddenByAncestor = false;
+            foreach ($locations as $location) {
+                if ($location->explicitlyHidden) {
+                    $hiddenLocations++;
+                    continue;
                 }
 
-                if ($hiddenLocations !== 0) {
-                    if (count($locations) === 1) {
-                        $title = $this->translator->trans('content.visibility.location_hidden', [], 'locationview');
-                    } else {
-                        $title = $this->translator->trans(
+                if ($location->isInvisible() && $location->getParentLocation()?->isInvisible()) {
+                    $hiddenLocations++;
+                    $hiddenByAncestor = true;
+                }
+            }
+
+            if ($hiddenLocations !== 0) {
+                if (count($locations) === 1) {
+                    $extraContent = $this->translator->trans('content.visibility.location_hidden', [], 'locationview');
+                } else {
+                    $extraContent = $hiddenByAncestor
+                        ? $this->translator->trans(
+                            'content.visibility.locations_hidden_by_ancestor',
+                            [
+                                '%hidden%' => $hiddenLocations,
+                                '%total%' => count($locations),
+                            ],
+                            'locationview',
+                        )
+                        : $this->translator->trans(
                             'content.visibility.locations_hidden',
                             [
                                 '%hidden%' => $hiddenLocations,
                                 '%total%' => count($locations),
                             ],
                             'locationview',
                         );
-                    }
                 }
-            } catch (BadStateException $e) {
-                $title = $this->translator->trans('content.visibility.cannot_fetch_locations', [], 'locationview');
             }
+        } catch (BadStateException $e) {
+            $extraContent = $this->translator->trans('content.visibility.cannot_fetch_locations', [], 'locationview');
         }
 
-        if (!isset($title)) {
+        if (!isset($title) && !isset($extraContent)) {
             return new Response('', Response::HTTP_NO_CONTENT);
         }
 
         return $this->render('@IbexaAdminUi/themes/admin/ui/component/alert/alert.html.twig',
             [
                 'type' => 'info',
-                'title' => $title,
+                'title' => $title ?? '',
+                'extra_content' => $extraContent ?? '',
                 'icon_path' => $iconPath,
                 'class' => 'mt-4',
             ],

bundle/Resources/translations/locationview.en.yaml

@@ -8,5 +8,6 @@ content.last_modified: "Last modified"
 
 content.visibility.content_hidden: "Content is hidden"
 content.visibility.location_hidden: "Location is hidden"
-content.visibility.locations_hidden: "Locations: %hidden% out of %total% hidden"
+content.visibility.locations_hidden: "%hidden% of %total% location(s) are hidden"
+content.visibility.locations_hidden_by_ancestor: "%hidden% of %total% location(s) are hidden by parent or ancestor location"
 content.visibility.cannot_fetch_locations: "Can't fetch locations for this content!"