FEATURE: Reimplementation: show contact person for inaccessible media usages #5578

Jan3k3y · 2025-06-21T11:43:26Z

rewrite controller function to get data from new workspace structure
changes structure of ´RelatedNodes.html´ to match new structure

Ticket: #5437

Checklist

Code follows the PSR-2 coding style
Tests have been created, run and adjusted as needed
The PR is created against the lowest maintained branch
Reviewer - PR Title is brief but complete and starts with FEATURE|TASK|BUGFIX
Reviewer - The first section explains the change briefly for change-logs
Reviewer - Breaking Changes are marked with !!! and have upgrade-instructions

- rewrite controller function to get data from new workspace structure - changes structure of ´RelatedNodes.html´ to match new structure Ticket: neos#5437

Ticket: neos#5437

- will be shown as ´---´ - removed in list view after ´./flow assetusage:index´ - if 'private' workspace exist wait for next user to join to show this name Ticket: neos#5437

crydotsnake · 2025-06-25T12:40:39Z

Neos.Media.Browser/Classes/Controller/UsageController.php

+    /**
+     * @Flow\Inject
+     * @var DomainUserService
+     */
+    protected $domainUserService;
+


Suggested change

/**

* @Flow\Inject

* @var DomainUserService

*/

protected $domainUserService;

#[Flow\Inject]

protected DomainUserService $domainUserService;

I was just taking the format from the other protected variables of the file to make it consistent.

Should I just apply this suggestion, rework the variables as well or leave it as it is? 🤔

I'm fine with both! Also with keeping it as it is. 😬

Using the attributes over annotation does not work for all cases. So you need to be careful rewriting all of them.

Note: Rewriting annotation to attributes work, but not the PHP type definition in all cases. But AFAIS this is an older issue.

dlubitz

Looks good by reading! Thanks @Jan3k3y for taking care.

Jan3k3y · 2025-09-17T13:58:33Z

Any updates here? 🤗

pKallert · 2025-10-20T09:11:04Z

Neos.Media.Browser/Resources/Private/Templates/Usage/RelatedNodes.html

-															  {inaccessibleRelation.label}
+                                <f:if condition="{inaccessibleRelation.relevantWorkspaceMetadata.owner}">
+                                    <f:then>
+                                        (@{inaccessibleRelation.relevantWorkspaceMetadata.owner})


This leads to an error

Suggested change

(@{inaccessibleRelation.relevantWorkspaceMetadata.owner})

(@{inaccessibleRelation.relevantWorkspaceMetadata.owner.label})

Thx for testing!

This will be solved by not giving full Entity into template

pKallert

Thank you for taking care of the todo!
I had some comments, but some are also personal preference that you can also decline 😄

I noticed some additonal stuff while testing out the feature. Those can be handled in a follow-up since they are not part of the reimplementation.

Table header for Element in Workspace is 'document', but the node is shown in the table
icon fa-group and its title tag are not shown, also the title is not translated. Icon should be fa-user-group

Neos.Media.Browser/Classes/Controller/UsageController.php

pKallert · 2025-10-20T09:33:41Z

Neos.Media.Browser/Classes/Controller/UsageController.php

-                $owner = $workspace->getOwner();
-                return '(' . $owner->getLabel() . ')';
+            $contentRepositoryId = SiteDetectionResult::fromRequest($this->request->getHttpRequest())->contentRepositoryId;
+            $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId);


I would prefer for this to be passed to the function avoid duplicate calls

pKallert · 2025-10-20T09:36:40Z

Neos.Media.Browser/Classes/Controller/UsageController.php

+            }
+
+            if ($workspaceMetadata->classification->value === WorkspaceClassification::PERSONAL->value) {
+                $structuredReturn['owner'] = $workspaceOwner;


As far as I can see, we only use the title of the workspace user, do we need to pass the whole object to the view or could we just use the label here?

Sounds good 🤗

Ticket: neos#5437

pKallert

Two comments to fix the nullable variables :)

Neos.Media.Browser/Classes/Controller/UsageController.php

Ticket: neos#5437

Neos.Media.Browser/Classes/Controller/UsageController.php

Co-authored-by: pKallert <[email protected]>

pKallert

Looks good!
Tested it out locally and works for me

github-actions bot added Feature 9.0 labels Jun 21, 2025

Jan3k3y force-pushed the reimplement/inaccessible-media-usage-contact-person branch 2 times, most recently from 67309aa to a7b5ba2 Compare June 21, 2025 11:44

Jan3k3y changed the base branch from 9.0 to 9.1 June 21, 2025 11:48

github-actions bot added 9.1 and removed 9.0 labels Jun 21, 2025

Reimplementation: show contact person for inaccessible media usages

3a9e942

- rewrite controller function to get data from new workspace structure - changes structure of ´RelatedNodes.html´ to match new structure Ticket: neos#5437

Jan3k3y force-pushed the reimplement/inaccessible-media-usage-contact-person branch from a7b5ba2 to 3a9e942 Compare June 21, 2025 11:59

dlubitz self-requested a review June 21, 2025 12:50

Jan3k3y added 2 commits June 21, 2025 15:56

Task: linting, null checks and ´@´ as username prefix

62486b5

Ticket: neos#5437

Task: catch usages in workspaces of deleted user

4430285

- will be shown as ´---´ - removed in list view after ´./flow assetusage:index´ - if 'private' workspace exist wait for next user to join to show this name Ticket: neos#5437

ahaeslich linked an issue Jun 21, 2025 that may be closed by this pull request

Reimplement "Show workspace owner/title in asset usage" for Neos 9.0 #5437

Open

Sebobo moved this to Reviews in PostCon Sprint 2025 Jun 23, 2025

Sebobo added this to PostCon Sprint 2025 Jun 23, 2025

mhsdesign requested a review from pKallert June 25, 2025 07:29

crydotsnake reviewed Jun 25, 2025

View reviewed changes

dlubitz approved these changes Jul 3, 2025

View reviewed changes

Jan3k3y requested a review from crydotsnake August 4, 2025 09:49

pKallert reviewed Oct 20, 2025

View reviewed changes

pKallert requested changes Oct 20, 2025

View reviewed changes

crydotsnake removed their request for review October 20, 2025 11:38

Task: no Entity for template, $contentRepository as parameter

8f67d47

Ticket: neos#5437

pKallert requested changes Oct 20, 2025

View reviewed changes

Neos.Media.Browser/Classes/Controller/UsageController.php Outdated Show resolved Hide resolved

Neos.Media.Browser/Classes/Controller/UsageController.php Outdated Show resolved Hide resolved

Task: nullable workspace owner

cb3e815

Ticket: neos#5437

pKallert reviewed Oct 21, 2025

View reviewed changes

Neos.Media.Browser/Classes/Controller/UsageController.php Outdated Show resolved Hide resolved

add null value for relatedUserName

a5f7947

Co-authored-by: pKallert <[email protected]>

pKallert approved these changes Oct 21, 2025

View reviewed changes

pKallert merged commit 2868887 into neos:9.1 Oct 21, 2025
13 checks passed

	(@{inaccessibleRelation.relevantWorkspaceMetadata.owner})
	(@{inaccessibleRelation.relevantWorkspaceMetadata.owner.label})

Uh oh!

FEATURE: Reimplementation: show contact person for inaccessible media usages #5578

FEATURE: Reimplementation: show contact person for inaccessible media usages #5578

Conversation

Jan3k3y commented Jun 21, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dlubitz left a comment

Choose a reason for hiding this comment

Uh oh!

Jan3k3y commented Sep 17, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pKallert left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pKallert left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pKallert left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants