Skip to content

Commit b284bc0

Browse files
committed
fix: AMEFF export falset() typos + hide concept orgs from public API
- ArchiMateExportService: fix 5 instances of `$this->isLis === falset(arr: ...)` to `$this->isList(arr: ...) === false` — was causing HTTP 500 on export (#135) - softwarecatalogus_register.json: add `"status": "Actief"` to all three public RBAC read rules for organisatie schema, preventing concept organisations from appearing in public search results (#447)
1 parent e3ce838 commit b284bc0

2 files changed

Lines changed: 16 additions & 13 deletions

File tree

lib/Service/ArchiMateExportService.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ private function addViewDataToXmlNode(\SimpleXMLElement $viewNode, array $viewDa
10541054
// Nodes.
10551055
if (isset($viewData['node']) === true && is_array($viewData['node']) === true) {
10561056
$nodes = $viewData['node'];
1057-
if ($this->isLis === falset(arr: $nodes)) {
1057+
if ($this->isList(arr: $nodes) === false) {
10581058
$nodes = [$nodes];
10591059
}
10601060

@@ -1069,7 +1069,7 @@ private function addViewDataToXmlNode(\SimpleXMLElement $viewNode, array $viewDa
10691069
// Connections.
10701070
if (isset($viewData['connection']) === true && is_array($viewData['connection']) === true) {
10711071
$connections = $viewData['connection'];
1072-
if ($this->isLis === falset(arr: $connections)) {
1072+
if ($this->isList(arr: $connections) === false) {
10731073
$connections = [$connections];
10741074
}
10751075

@@ -1182,7 +1182,7 @@ private function addNodeDataToXmlElement(\SimpleXMLElement $nodeElement, array $
11821182
// Nested nodes (Container/Element type).
11831183
if (isset($nodeData['node']) === true && is_array($nodeData['node']) === true) {
11841184
$nestedNodes = $nodeData['node'];
1185-
if ($this->isLis === falset(arr: $nestedNodes)) {
1185+
if ($this->isList(arr: $nestedNodes) === false) {
11861186
$nestedNodes = [$nestedNodes];
11871187
}
11881188

@@ -1211,7 +1211,7 @@ private function addOrganizationItemToXml(\SimpleXMLElement $itemNode, array $it
12111211
// Labels first.
12121212
if (isset($itemData['label']) === true) {
12131213
$labels = $itemData['label'];
1214-
if (is_array($labels) === true && $this->isLis === falset(arr: $labels)) {
1214+
if (is_array($labels) === true && $this->isList(arr: $labels) === false) {
12151215
$labels = [$labels];
12161216
// Single label → list.
12171217
}
@@ -1238,7 +1238,7 @@ private function addOrganizationItemToXml(\SimpleXMLElement $itemNode, array $it
12381238
// Nested items.
12391239
if (isset($itemData['item']) === true) {
12401240
$items = $itemData['item'];
1241-
if (is_array($items) === true && $this->isLis === falset(arr: $items)) {
1241+
if (is_array($items) === true && $this->isList(arr: $items) === false) {
12421242
$items = [$items];
12431243
}
12441244

@@ -2528,7 +2528,7 @@ private function injectApplicationNodesInView(array $viewData, array $refCompApp
25282528
// Inject into top-level nodes.
25292529
if (isset($viewData['node']) === true && is_array($viewData['node']) === true) {
25302530
$nodes = $viewData['node'];
2531-
if ($this->isLis === falset(arr: $nodes)) {
2531+
if ($this->isList(arr: $nodes)) {
25322532
$nodes = [$nodes];
25332533
}
25342534

@@ -2539,7 +2539,7 @@ private function injectApplicationNodesInView(array $viewData, array $refCompApp
25392539
if (empty($newConnections) === false) {
25402540
if (isset($viewData['connection']) === false) {
25412541
$viewData['connection'] = [];
2542-
} else if ($this->isLis === falset(arr: $viewData['connection'])) {
2542+
} else if ($this->isList(arr: $viewData['connection'])) {
25432543
$viewData['connection'] = [$viewData['connection']];
25442544
}
25452545

@@ -2579,7 +2579,7 @@ private function processNodesForInjection(array $nodes, array $refCompApps, arra
25792579
// Ensure nested nodes array.
25802580
if (isset($node['node']) === false) {
25812581
$node['node'] = [];
2582-
} else if ($this->isLis === falset(arr: $node['node'])) {
2582+
} else if ($this->isList(arr: $node['node'])) {
25832583
$node['node'] = [$node['node']];
25842584
}
25852585

@@ -2628,7 +2628,7 @@ private function processNodesForInjection(array $nodes, array $refCompApps, arra
26282628
// Recurse into nested nodes.
26292629
if (isset($node['node']) === true && is_array($node['node']) === true) {
26302630
$nestedNodes = $node['node'];
2631-
if ($this->isLis === falset(arr: $nestedNodes)) {
2631+
if ($this->isList(arr: $nestedNodes)) {
26322632
$nestedNodes = [$nestedNodes];
26332633
}
26342634

lib/Settings/softwarecatalogus_register.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"info": {
44
"title": "Software Catalog Register",
55
"description": "Register containing AMEF and Voorzieningen schemas for the VNG Software Catalog application. This configuration includes schemas for applications, services, organizations, and compliance tracking.",
6-
"version": "2.2.0"
6+
"version": "2.2.1"
77
},
88
"x-openregister": {
99
"type": "application",
@@ -2463,19 +2463,22 @@
24632463
{
24642464
"group": "public",
24652465
"match": {
2466-
"geregistreerdDoor": "Leverancier"
2466+
"geregistreerdDoor": "Leverancier",
2467+
"status": "Actief"
24672468
}
24682469
},
24692470
{
24702471
"group": "public",
24712472
"match": {
2472-
"type": "Gemeente"
2473+
"type": "Gemeente",
2474+
"status": "Actief"
24732475
}
24742476
},
24752477
{
24762478
"group": "public",
24772479
"match": {
2478-
"type": "Samenwerking"
2480+
"type": "Samenwerking",
2481+
"status": "Actief"
24792482
}
24802483
}
24812484
],

0 commit comments

Comments
 (0)