Summary Consolidates the “Tenant Operate Hub” work (Spec 085) and the follow-up adjustments from the 086 session merge into a single branch ready to merge into dev. Primary focus: stabilize Ops/Operate Hub UX flows, tighten/align authorization semantics, and make the full Sail test suite green. Key Changes Ops UX / Verification Readonly members can view verification operation runs (reports) while starting verification remains restricted. Normalized failure reason-code handling and aligned UX expectations with the provider reason-code taxonomy. Onboarding wizard UX “Start verification” CTA is hidden while a verification run is active; “Refresh” is shown during in-progress runs. Treats provider_permission_denied as a blocking reason (while keeping legacy compatibility). Test + fixture hardening Standardized use of default provider connection fixtures in tests where sync/restore flows require it. Fixed multiple Filament URL/tenant-context test cases to avoid 404s and reduce tenancy routing brittleness. Policy sync / restore safety Enrollment configuration type collision classification tests now exercise the real sync path (with required provider connection present). Restore edge-case safety tests updated to reflect current provider-connection requirements. Testing vendor/bin/sail artisan test --compact (green) vendor/bin/sail bin pint --dirty (green) Notes Includes merged 086 session work already (no separate PR needed). Co-authored-by: Ahmed Darrazi <ahmeddarrazi@ebc83aaa-d947-4a08-b88e-bd72ac9645f7.fritz.box> Co-authored-by: Ahmed Darrazi <ahmeddarrazi@MacBookPro.fritz.box> Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.fritz.box> Reviewed-on: #103
223 lines
7.2 KiB
PHP
223 lines
7.2 KiB
PHP
<?php
|
|
|
|
use App\Models\Policy;
|
|
use App\Models\PolicyVersion;
|
|
use App\Models\Tenant;
|
|
use App\Models\User;
|
|
|
|
beforeEach(function () {
|
|
putenv('INTUNE_TENANT_ID');
|
|
unset($_ENV['INTUNE_TENANT_ID'], $_SERVER['INTUNE_TENANT_ID']);
|
|
|
|
$this->tenant = Tenant::factory()->create();
|
|
$this->policy = Policy::factory()->create([
|
|
'tenant_id' => $this->tenant->id,
|
|
]);
|
|
$this->user = User::factory()->create();
|
|
[$this->user, $this->tenant] = createUserWithTenant($this->tenant, $this->user, role: 'owner');
|
|
});
|
|
|
|
it('displays policy version page', function () {
|
|
$version = PolicyVersion::factory()->create([
|
|
'tenant_id' => $this->tenant->id,
|
|
'policy_id' => $this->policy->id,
|
|
'version_number' => 1,
|
|
]);
|
|
|
|
$this->actingAs($this->user);
|
|
|
|
$response = $this->get(route('filament.admin.resources.policy-versions.view', array_merge(
|
|
filamentTenantRouteParams($this->tenant),
|
|
['record' => $version],
|
|
)));
|
|
|
|
$response->assertOk();
|
|
});
|
|
|
|
it('displays assignments widget when version has assignments', function () {
|
|
$version = PolicyVersion::factory()->create([
|
|
'tenant_id' => $this->tenant->id,
|
|
'policy_id' => $this->policy->id,
|
|
'version_number' => 1,
|
|
'assignments' => [
|
|
[
|
|
'id' => 'assignment-1',
|
|
'intent' => 'apply',
|
|
'target' => [
|
|
'@odata.type' => '#microsoft.graph.groupAssignmentTarget',
|
|
'groupId' => 'group-123',
|
|
'assignment_filter_name' => 'Targeted Devices',
|
|
'deviceAndAppManagementAssignmentFilterId' => 'filter-1',
|
|
'deviceAndAppManagementAssignmentFilterType' => 'include',
|
|
],
|
|
],
|
|
[
|
|
'id' => 'assignment-2',
|
|
'intent' => 'apply',
|
|
'target' => [
|
|
'@odata.type' => '#microsoft.graph.exclusionGroupAssignmentTarget',
|
|
'groupId' => 'group-456',
|
|
'deviceAndAppManagementAssignmentFilterId' => null,
|
|
'deviceAndAppManagementAssignmentFilterType' => 'none',
|
|
],
|
|
],
|
|
],
|
|
'scope_tags' => [
|
|
'ids' => ['0'],
|
|
'names' => ['Default'],
|
|
],
|
|
]);
|
|
|
|
$this->actingAs($this->user);
|
|
|
|
$response = $this->get(route('filament.admin.resources.policy-versions.view', array_merge(
|
|
filamentTenantRouteParams($this->tenant),
|
|
['record' => $version],
|
|
)));
|
|
|
|
$response->assertOk();
|
|
$response->assertSeeLivewire('policy-version-assignments-widget');
|
|
$response->assertSee('2 assignment(s)');
|
|
$response->assertSee('Include group');
|
|
$response->assertSee('Exclude group');
|
|
$response->assertSee('Filter (include): Targeted Devices');
|
|
});
|
|
|
|
it('displays empty state when version has no assignments', function () {
|
|
$version = PolicyVersion::factory()->create([
|
|
'tenant_id' => $this->tenant->id,
|
|
'policy_id' => $this->policy->id,
|
|
'version_number' => 1,
|
|
'assignments' => null,
|
|
]);
|
|
|
|
$this->actingAs($this->user);
|
|
|
|
$response = $this->get(route('filament.admin.resources.policy-versions.view', array_merge(
|
|
filamentTenantRouteParams($this->tenant),
|
|
['record' => $version],
|
|
)));
|
|
|
|
$response->assertOk();
|
|
$response->assertSee('Assignments were not captured for this version');
|
|
});
|
|
|
|
it('shows empty assignments message when assignments were fetched', function () {
|
|
$version = PolicyVersion::factory()->create([
|
|
'tenant_id' => $this->tenant->id,
|
|
'policy_id' => $this->policy->id,
|
|
'version_number' => 1,
|
|
'assignments' => null,
|
|
'metadata' => [
|
|
'assignments_fetched' => true,
|
|
'assignments_count' => 0,
|
|
],
|
|
]);
|
|
|
|
$this->actingAs($this->user);
|
|
|
|
$response = $this->get(route('filament.admin.resources.policy-versions.view', array_merge(
|
|
filamentTenantRouteParams($this->tenant),
|
|
['record' => $version],
|
|
)));
|
|
|
|
$response->assertOk();
|
|
$response->assertSee('No assignments found for this version');
|
|
});
|
|
|
|
it('shows compliance notifications when present', function () {
|
|
$version = PolicyVersion::factory()->create([
|
|
'tenant_id' => $this->tenant->id,
|
|
'policy_id' => $this->policy->id,
|
|
'version_number' => 1,
|
|
'policy_type' => 'deviceCompliancePolicy',
|
|
'assignments' => null,
|
|
'snapshot' => [
|
|
'scheduledActionsForRule' => [
|
|
[
|
|
'ruleName' => 'Test rule',
|
|
'scheduledActionConfigurations' => [
|
|
[
|
|
'actionType' => 'notification',
|
|
'notificationTemplateId' => 'template-123',
|
|
],
|
|
],
|
|
],
|
|
],
|
|
],
|
|
]);
|
|
|
|
$this->actingAs($this->user);
|
|
|
|
$response = $this->get(route('filament.admin.resources.policy-versions.view', array_merge(
|
|
filamentTenantRouteParams($this->tenant),
|
|
['record' => $version],
|
|
)));
|
|
|
|
$response->assertOk();
|
|
$response->assertSee('Compliance notifications');
|
|
$response->assertSee('Test rule');
|
|
$response->assertSee('template-123');
|
|
});
|
|
|
|
it('uses a default label when compliance rule name is missing', function () {
|
|
$version = PolicyVersion::factory()->create([
|
|
'tenant_id' => $this->tenant->id,
|
|
'policy_id' => $this->policy->id,
|
|
'version_number' => 1,
|
|
'policy_type' => 'deviceCompliancePolicy',
|
|
'assignments' => null,
|
|
'snapshot' => [
|
|
'scheduledActionsForRule' => [
|
|
[
|
|
'ruleName' => null,
|
|
'scheduledActionConfigurations' => [
|
|
[
|
|
'actionType' => 'notification',
|
|
'notificationTemplateId' => 'template-456',
|
|
],
|
|
],
|
|
],
|
|
],
|
|
],
|
|
]);
|
|
|
|
$this->actingAs($this->user);
|
|
|
|
$response = $this->get(route('filament.admin.resources.policy-versions.view', array_merge(
|
|
filamentTenantRouteParams($this->tenant),
|
|
['record' => $version],
|
|
)));
|
|
|
|
$response->assertOk();
|
|
$response->assertSee('Compliance notifications');
|
|
$response->assertSee('Default rule');
|
|
$response->assertSee('template-456');
|
|
});
|
|
|
|
it('renders structured normalized settings for compliance policy versions', function () {
|
|
$version = PolicyVersion::factory()->create([
|
|
'tenant_id' => $this->tenant->id,
|
|
'policy_id' => $this->policy->id,
|
|
'version_number' => 1,
|
|
'policy_type' => 'deviceCompliancePolicy',
|
|
'platform' => 'all',
|
|
'snapshot' => [
|
|
'@odata.type' => '#microsoft.graph.windows10CompliancePolicy',
|
|
'passwordRequired' => true,
|
|
],
|
|
]);
|
|
|
|
$this->actingAs($this->user);
|
|
|
|
$response = $this->get(route('filament.admin.resources.policy-versions.view', array_merge(
|
|
filamentTenantRouteParams($this->tenant),
|
|
['record' => $version, 'tab' => 'normalized-settings'],
|
|
)));
|
|
|
|
$response->assertOk();
|
|
$response->assertSee('Password & Access');
|
|
$response->assertSee('Password required');
|
|
$response->assertSee('Enabled');
|
|
});
|