failj/ntspi-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(vikon): use moduleData['id'] instead of array key, handle additional_access_flags

Browse Source
This commit is contained in:
F4ilji
2026-07-05 12:25:15 +05:00
parent 97c4ab99f1
commit efce5be699
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Containers/VikonIntegration/Actions/CheckAccessAction.php
+23 -10
View File
@@ -50,22 +50,35 @@ class CheckAccessAction
} }
// Extract parts per module from the API response // Extract parts per module from the API response
// API keys are sequential ("0","1","2"), real module ID is in $moduleData['id']
$partsByModule = []; $partsByModule = [];
$flags = $body['tree_access']['additional_access_flags'] ?? [];
if (isset($body['tree_access']) && is_array($body['tree_access'])) { if (isset($body['tree_access']) && is_array($body['tree_access'])) {
foreach ($body['tree_access'] as $moduleId => $moduleData) { foreach ($body['tree_access'] as $moduleData) {
$intId = (int) $moduleId; if (!isset($moduleData['id']) || !isset($moduleData['parts']) || !is_array($moduleData['parts'])) {
if (isset($moduleData['parts']) && is_array($moduleData['parts'])) { continue;
$partsByModule[$intId] = array_map(
fn($p) => ['id' => $p['id'], 'name' => $p['name'] ?? $p['id'], 'access' => $p['access'] ?? true],
$moduleData['parts']
);
} }
$moduleId = (int) $moduleData['id'];
// Skip modules disabled by additional_access_flags
$moduleFlag = 'no_update_' . config("vikon.modules.{$moduleId}.path", '');
if (in_array($moduleFlag, $flags)) {
continue;
}
// Filter out parts disabled by flags
$parts = array_filter($moduleData['parts'], function ($p) use ($flags) {
$partFlag = 'no_update_' . $p['id'] . '_part';
return !in_array($partFlag, $flags);
});
$partsByModule[$moduleId] = array_map(
fn($p) => ['id' => $p['id'], 'name' => $p['name'] ?? $p['id'], 'access' => $p['access'] ?? true],
array_values($parts)
);
} }
} }
Log::info('Vikon modules tree raw', ['tree_access' => $body['tree_access']]);
Log::info('Vikon parts extracted', ['parts' => $partsByModule]);
return [ return [
'has_access' => true, 'has_access' => true,
'error' => null, 'error' => null,