Merge branch '475260-fix-broken-validation' into 'master'

Update schema processing for policy editor

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/164415



Merged-by: Artur Fedorov <afedorov@gitlab.com>
Approved-by: Artur Fedorov <afedorov@gitlab.com>
Co-authored-by: Alexander Turinske <aturinske@gitlab.com>

app/assets/javascripts/editor/extensions/source_editor_security_policy_schema_ext.js

@@ -28,6 +28,7 @@ export const getSinglePolicySchema = async ({ namespacePath, namespaceType, poli
       schemaForMultiplePolicies.properties[policyType]?.items?.properties ||
       schemaForMultiplePolicies.$defs[policyType]?.items?.properties ||
       {};
+
     return {
       title: schemaForMultiplePolicies.title,
       description: schemaForMultiplePolicies.description,
@@ -41,6 +42,7 @@ export const getSinglePolicySchema = async ({ namespacePath, namespaceType, poli
         },
         ...properties,
       },
+      $defs: schemaForMultiplePolicies.$defs,
     };
   } catch {
     return {};

spec/frontend/editor/source_editor_security_policy_schema_ext_spec.js

@@ -16,8 +16,13 @@ jest.mock('~/ide/utils');
 
 const mockNamespacePath = 'mock-namespace';
 
+const $defs = {
+  reused_policy: { items: { properties: { flam: 'jam' } } },
+  policy_scope: { type: 'object' },
+};
+
 const mockSchema = {
-  $defs: { reused_policy: { items: { properties: { flam: 'jam' } } } },
+  $defs,
   title: 'mockSchema',
   description: 'mockDescriptions',
   type: 'Object',
@@ -32,6 +37,7 @@ const mockCommonData = {
   title: 'mockSchema',
   description: 'mockDescriptions',
   type: 'Object',
+  $defs,
 };
 
 const mockScanExecutionPolicyProperties = {