Skip to content

Show the organization type everywhere #1574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Show the organization type everywhere #1574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions src/Service/Api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1190,15 +1190,44 @@ public function getEnvironmentLabel(Environment $environment, $tag = 'info', $sh
*/
public function getOrganizationLabel(Organization $organization, $tag = 'info')
{
$showType = (bool) $this->config->get('api.organization_types');
$type = $showType ? $organization->type : '';

$name = $organization->name;
$label = $organization->label;
$use_label = strlen($label) > 0 && $label !== $name;
$pattern = $use_label ? '%2$s (%3$s)' : '%3$s';
$useLabel = strlen($label) > 0 && $label !== $name;

if ($tag !== false) {
$pattern = $use_label ? '<%1$s>%2$s</%1$s> (%3$s)' : '<%1$s>%3$s</%1$s>';
if ($useLabel && $showType) {
// Tag, label, name and type.
$pattern = '<%1$s>%2$s</%1$s> (name: <%1$s>%3$s</%1$s>, type: <%1$s>%4$s</%1$s>)';
} else if ($useLabel) {
// Tag, label and name.
$pattern = '<%1$s>%2$s</%1$s> (<%1$s>%3$s</%1$s>)';
} else if ($showType) {
// Tag, label and type.
$pattern = '<%1$s>%3$s</%1$s> (type: <%1$s>%4$s</%1$s>)';
} else {
// Tag and name only.
$pattern = '<%1$s>%3$s</%1$s>';
}
} else {
if ($useLabel && $showType) {
// Label, name and type.
$pattern = '%2$s (name: %3$s, type: %4$s)';
} else if ($useLabel) {
// Label and name.
$pattern = '%2$s (%3$s)';
} else if ($showType) {
// Label and type.
$pattern = '%3$s (type: %4$s)';
} else {
// Name only.
$pattern = '%3$s';
}
}

return sprintf($pattern, $tag, $label, $name);
return sprintf($pattern, $tag, $label, $name, $type);
}

/**
Expand Down
Loading