diff --git a/resources/views/filament/forms/components/restore-run-checks.blade.php b/resources/views/filament/forms/components/restore-run-checks.blade.php index fe1ff6d..e7469ba 100644 --- a/resources/views/filament/forms/components/restore-run-checks.blade.php +++ b/resources/views/filament/forms/components/restore-run-checks.blade.php @@ -1,4 +1,6 @@ @php + $fieldWrapperView = $getFieldWrapperView(); + $results = $getState() ?? []; $results = is_array($results) ? $results : []; @@ -37,82 +39,83 @@ }; @endphp -
- -
- - {{ $blocking }} blocking - - - {{ $warning }} warnings - - - {{ $safe }} safe - -
- - - @if ($results === []) - -
- No checks have been run yet. + +
+ +
+ + {{ $blocking }} blocking + + + {{ $warning }} warnings + + + {{ $safe }} safe +
- @else -
- @foreach ($results as $result) - @php - $severity = is_array($result) ? ($result['severity'] ?? 'safe') : 'safe'; - $title = is_array($result) ? ($result['title'] ?? $result['code'] ?? 'Check') : 'Check'; - $message = is_array($result) ? ($result['message'] ?? null) : null; - $meta = is_array($result) ? ($result['meta'] ?? []) : []; - $meta = is_array($meta) ? $meta : []; - $unmappedGroups = $meta['unmapped'] ?? []; - $unmappedGroups = is_array($unmappedGroups) ? $limitedList($unmappedGroups) : []; - @endphp + @if ($results === []) + +
+ No checks have been run yet. +
+ + @else +
+ @foreach ($results as $result) + @php + $severity = is_array($result) ? ($result['severity'] ?? 'safe') : 'safe'; + $title = is_array($result) ? ($result['title'] ?? $result['code'] ?? 'Check') : 'Check'; + $message = is_array($result) ? ($result['message'] ?? null) : null; + $meta = is_array($result) ? ($result['meta'] ?? []) : []; + $meta = is_array($meta) ? $meta : []; - -
-
-
- {{ $title }} -
- @if (is_string($message) && $message !== '') -
- {{ $message }} + $unmappedGroups = $meta['unmapped'] ?? []; + $unmappedGroups = is_array($unmappedGroups) ? $limitedList($unmappedGroups) : []; + @endphp + + +
+
+
+ {{ $title }}
- @endif -
- - - {{ ucfirst((string) $severity) }} - -
- - @if ($unmappedGroups !== []) -
-
- Unmapped groups + @if (is_string($message) && $message !== '') +
+ {{ $message }} +
+ @endif
-
    - @foreach ($unmappedGroups as $group) - @php - $label = is_array($group) ? ($group['label'] ?? $group['id'] ?? null) : null; - @endphp - @if (is_string($label) && $label !== '') -
  • {{ $label }}
    • - @endif - @endforeach -
-
- @endif - - @endforeach -
- @endif -
+ + {{ ucfirst((string) $severity) }} + +
+ + @if ($unmappedGroups !== []) +
+
+ Unmapped groups +
+
    + @foreach ($unmappedGroups as $group) + @php + $label = is_array($group) ? ($group['label'] ?? $group['id'] ?? null) : null; + @endphp + @if (is_string($label) && $label !== '') +
  • {{ $label }}
    • + @endif + @endforeach +
+
+ @endif + + @endforeach +
+ @endif +
+ diff --git a/resources/views/filament/forms/components/restore-run-preview.blade.php b/resources/views/filament/forms/components/restore-run-preview.blade.php index 174c6ea..f92e4b1 100644 --- a/resources/views/filament/forms/components/restore-run-preview.blade.php +++ b/resources/views/filament/forms/components/restore-run-preview.blade.php @@ -1,4 +1,6 @@ @php + $fieldWrapperView = $getFieldWrapperView(); + $diffs = $getState() ?? []; $diffs = is_array($diffs) ? $diffs : []; @@ -33,145 +35,146 @@ }; @endphp -
- -
- - {{ $policiesChanged }}/{{ $policiesTotal }} policies changed - - - {{ $assignmentsChanged }} assignments changed - - - {{ $scopeTagsChanged }} scope tags changed - - @if ($diffsOmitted > 0) - - {{ $diffsOmitted }} diffs omitted (limit) + +
+ +
+ + {{ $policiesChanged }}/{{ $policiesTotal }} policies changed - @endif -
- - - @if ($diffs === []) - -
- No preview generated yet. + + {{ $assignmentsChanged }} assignments changed + + + {{ $scopeTagsChanged }} scope tags changed + + @if ($diffsOmitted > 0) + + {{ $diffsOmitted }} diffs omitted (limit) + + @endif
- @else -
- @foreach ($diffs as $entry) - @php - $entry = is_array($entry) ? $entry : []; - $name = $entry['display_name'] ?? $entry['policy_identifier'] ?? 'Item'; - $type = $entry['policy_type'] ?? 'type'; - $platform = $entry['platform'] ?? 'platform'; - $action = $entry['action'] ?? 'update'; - $diff = is_array($entry['diff'] ?? null) ? $entry['diff'] : []; - $diffSummary = is_array($diff['summary'] ?? null) ? $diff['summary'] : []; - $added = (int) ($diffSummary['added'] ?? 0); - $removed = (int) ($diffSummary['removed'] ?? 0); - $changed = (int) ($diffSummary['changed'] ?? 0); + @if ($diffs === []) + +
+ No preview generated yet. +
+ + @else +
+ @foreach ($diffs as $entry) + @php + $entry = is_array($entry) ? $entry : []; + $name = $entry['display_name'] ?? $entry['policy_identifier'] ?? 'Item'; + $type = $entry['policy_type'] ?? 'type'; + $platform = $entry['platform'] ?? 'platform'; + $action = $entry['action'] ?? 'update'; + $diff = is_array($entry['diff'] ?? null) ? $entry['diff'] : []; + $diffSummary = is_array($diff['summary'] ?? null) ? $diff['summary'] : []; - $assignmentsDelta = (bool) ($entry['assignments_changed'] ?? false); - $scopeTagsDelta = (bool) ($entry['scope_tags_changed'] ?? false); - $diffOmitted = (bool) ($entry['diff_omitted'] ?? false); - $diffTruncated = (bool) ($entry['diff_truncated'] ?? false); + $added = (int) ($diffSummary['added'] ?? 0); + $removed = (int) ($diffSummary['removed'] ?? 0); + $changed = (int) ($diffSummary['changed'] ?? 0); - $changedKeys = $limitedKeys(is_array($diff['changed'] ?? null) ? $diff['changed'] : []); - $addedKeys = $limitedKeys(is_array($diff['added'] ?? null) ? $diff['added'] : []); - $removedKeys = $limitedKeys(is_array($diff['removed'] ?? null) ? $diff['removed'] : []); - @endphp + $assignmentsDelta = (bool) ($entry['assignments_changed'] ?? false); + $scopeTagsDelta = (bool) ($entry['scope_tags_changed'] ?? false); + $diffOmitted = (bool) ($entry['diff_omitted'] ?? false); + $diffTruncated = (bool) ($entry['diff_truncated'] ?? false); - -
- - {{ $action }} - - - {{ $added }} added - - - {{ $removed }} removed - - - {{ $changed }} changed - - @if ($assignmentsDelta) + $changedKeys = $limitedKeys(is_array($diff['changed'] ?? null) ? $diff['changed'] : []); + $addedKeys = $limitedKeys(is_array($diff['added'] ?? null) ? $diff['added'] : []); + $removedKeys = $limitedKeys(is_array($diff['removed'] ?? null) ? $diff['removed'] : []); + @endphp + + +
+ + {{ $action }} + + + {{ $added }} added + + + {{ $removed }} removed + - assignments + {{ $changed }} changed - @endif - @if ($scopeTagsDelta) - - scope tags - - @endif - @if ($diffTruncated) - - truncated - - @endif -
- - @if ($diffOmitted) -
- Diff details omitted due to preview limits. Narrow scope to see more items in detail. -
- @elseif ($changedKeys !== [] || $addedKeys !== [] || $removedKeys !== []) -
- @if ($changedKeys !== []) -
-
- Changed keys (sample) -
-
    - @foreach ($changedKeys as $key) -
  • - {{ $key }} -
    • - @endforeach -
-
+ @if ($assignmentsDelta) + + assignments + @endif - @if ($addedKeys !== []) -
-
- Added keys (sample) -
-
    - @foreach ($addedKeys as $key) -
  • - {{ $key }} -
    • - @endforeach -
-
+ @if ($scopeTagsDelta) + + scope tags + @endif - @if ($removedKeys !== []) -
-
- Removed keys (sample) -
-
    - @foreach ($removedKeys as $key) -
  • - {{ $key }} -
    • - @endforeach -
-
+ @if ($diffTruncated) + + truncated + @endif
- @endif - - @endforeach -
- @endif -
+ @if ($diffOmitted) +
+ Diff details omitted due to preview limits. Narrow scope to see more items in detail. +
+ @elseif ($changedKeys !== [] || $addedKeys !== [] || $removedKeys !== []) +
+ @if ($changedKeys !== []) +
+
+ Changed keys (sample) +
+
    + @foreach ($changedKeys as $key) +
  • + {{ $key }} +
    • + @endforeach +
+
+ @endif + @if ($addedKeys !== []) +
+
+ Added keys (sample) +
+
    + @foreach ($addedKeys as $key) +
  • + {{ $key }} +
    • + @endforeach +
+
+ @endif + @if ($removedKeys !== []) +
+
+ Removed keys (sample) +
+
    + @foreach ($removedKeys as $key) +
  • + {{ $key }} +
    • + @endforeach +
+
+ @endif +
+ @endif + + @endforeach +
+ @endif +
+