Merge branch '496451-policies-policy-scope-scope-info-row' into 'master'

Add extra check for policy scope drawer

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



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

ee/app/assets/javascripts/security_orchestration/components/policy_drawer/scope_info_row.vue

@@ -83,20 +83,26 @@ export default {
     isProject() {
       return isProject(this.namespaceType);
     },
+    showScopeSection() {
+      return this.isGroup || this.hasMultipleProjectsLinked;
+    },
     policyScopeHasComplianceFrameworks() {
-      return policyScopeHasComplianceFrameworks(this.policyScope);
+      return policyScopeHasComplianceFrameworks(this.policyScope) && this.showScopeSection;
     },
     policyScopeHasIncludingProjects() {
       return policyScopeHasIncludingProjects(this.policyScope);
     },
     policyScopeHasGroups() {
-      return policyScopeHasGroups(this.policyScope) && this.showGroupScope;
+      return policyScopeHasGroups(this.policyScope) && this.showGroupScope && this.showScopeSection;
     },
     policyScopeHasExcludingProjects() {
       return policyScopeHasExcludingProjects(this.policyScope);
     },
     policyHasProjects() {
-      return this.policyScopeHasIncludingProjects || this.policyScopeHasExcludingProjects;
+      return (
+        (this.policyScopeHasIncludingProjects || this.policyScopeHasExcludingProjects) &&
+        this.showScopeSection
+      );
     },
     policyScopeGroups() {
       return policyScopeGroups(this.policyScope);

ee/spec/frontend/security_orchestration/components/policy_drawer/scope_info_row_spec.js

@@ -254,7 +254,7 @@ describe('ScopeInfoRow', () => {
       );
     });
-    it('renders group scope when groups and project exceptions are provided on project level', () => {
+    it('does not render group scope when groups and project exceptions are provided on project level', () => {
       createComponent({
         propsData: {
           policyScope: {
@@ -267,13 +267,47 @@ describe('ScopeInfoRow', () => {
           },
         },
         provide: {
-          namaspaceType: NAMESPACE_TYPES.PROJECT,
+          namespaceType: NAMESPACE_TYPES.PROJECT,
+          glFeatures: {
+            policyGroupScopeProject: true,
+          },
+        },
+      });
+
+      expect(findGroupsToggleList().exists()).toBe(false);
+    });
+
+    it('renders group scope when groups and project exceptions are provided on project level', async () => {
+      createComponent({
+        handler: mockLinkedSppItemsResponse({
+          projects: [
+            { id: '1', name: 'name1', fullPath: 'fullPath1' },
+            { id: '2', name: 'name2', fullPath: 'fullPath2' },
+          ],
+          groups: [
+            { id: '1', name: 'name1', fullPath: 'fullPath1' },
+            { id: '2', name: 'name2', fullPath: 'fullPath2' },
+          ],
+        }),
+        propsData: {
+          policyScope: {
+            includingGroups: {
+              nodes: items,
+            },
+            excludingProjects: {
+              nodes: items,
+            },
+          },
+        },
+        provide: {
+          namespaceType: NAMESPACE_TYPES.PROJECT,
           glFeatures: {
-            policyGroupScope: true,
+            policyGroupScopeProject: true,
           },
         },
       });
+      await waitForPromises();
       expect(findGroupsToggleList().exists()).toBe(true);
       expect(findGroupsToggleList().props('groups')).toEqual(items);
       expect(findGroupsToggleList().props('projects')).toEqual(items);