ahmido/TenantAtlas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

merge: origin/dev into feat/007-device-config-compliance

Browse Source
This commit is contained in:
Ahmed Darrazi 2025-12-29 13:41:49 +01:00
commit f4335684bb
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/Services/Intune/RestoreService.php
View File

@ -1702,6 +1702,24 @@ private function buildSettingsCatalogCreatePayload(
return $payload; return $payload;
} }
private function prefixRestoredName(?string $name, string $fallback): string
{
$prefix = 'Restored_';
$base = trim((string) ($name ?? $fallback));
if ($base === '') {
$base = $fallback;
}
$normalized = strtolower($base);
if (str_starts_with($normalized, 'restored_') || str_starts_with($normalized, 'restored ')) {
return $base;
}
return $prefix.$base;
}
/** /**
* @param array<string, mixed> $payload * @param array<string, mixed> $payload
* @param array<string, mixed> $originalPayload * @param array<string, mixed> $originalPayload
@ -1759,24 +1777,6 @@ private function applyOdataTypeForCreate(string $policyType, array $payload, arr
return $payload; return $payload;
} }
private function prefixRestoredName(?string $name, string $fallback): string
{
$prefix = 'Restored_';
$base = trim((string) ($name ?? $fallback));
if ($base === '') {
$base = $fallback;
}
$normalized = strtolower($base);
if (str_starts_with($normalized, 'restored_') || str_starts_with($normalized, 'restored ')) {
return $base;
}
return $prefix.$base;
}
/** /**
* @param array<string, mixed> $payload * @param array<string, mixed> $payload
* @param array<int, string> $keys * @param array<int, string> $keys

1
resources/views/filament/infolists/entries/restore-preview.blade.php
View File

@ -88,7 +88,6 @@
{{ $item['compliance_action_warning'] }} {{ $item['compliance_action_warning'] }}
</div> </div>
@endif @endif
@if (! empty($item['compliance_action_summary']) && is_array($item['compliance_action_summary'])) @if (! empty($item['compliance_action_summary']) && is_array($item['compliance_action_summary']))
@php @php
$summary = $item['compliance_action_summary']; $summary = $item['compliance_action_summary'];

1
resources/views/livewire/policy-version-assignments-widget.blade.php
View File

@ -106,6 +106,7 @@
$assignmentsFetchFailed = $version->metadata['assignments_fetch_failed'] ?? false; $assignmentsFetchFailed = $version->metadata['assignments_fetch_failed'] ?? false;
$assignmentsFetchError = $version->metadata['assignments_fetch_error'] ?? null; $assignmentsFetchError = $version->metadata['assignments_fetch_error'] ?? null;
@endphp @endphp
@if($assignmentsFetchFailed) @if($assignmentsFetchFailed)
<p class="text-sm text-gray-500 dark:text-gray-400"> <p class="text-sm text-gray-500 dark:text-gray-400">
Assignments could not be fetched from Microsoft Graph. Assignments could not be fetched from Microsoft Graph.