Merge branch '338839-do-not-get-network-requests' into 'master'

Update network policy request

See merge request gitlab-org/gitlab!68990

ee/app/assets/javascripts/threat_monitoring/components/policies/policies_list.vue

@@ -81,7 +81,9 @@ export default {
       },
       error: createPolicyFetchError,
       skip() {
-        return this.isLoadingEnvironments || !this.shouldShowNetworkPolicies;
+        return (
+          !this.hasEnvironment || this.isLoadingEnvironments || !this.shouldShowNetworkPolicies
+        );
       },
     },
     scanExecutionPolicies: {

ee/spec/frontend/threat_monitoring/components/policies/policies_list_spec.js

@@ -32,9 +32,10 @@ const environments = [
     global_id: 'gid://gitlab/Environment/3',
   },
 ];
+const networkPoliciesSpy = networkPolicies(mockNetworkPoliciesResponse);
 const scanExecutionPoliciesSpy = scanExecutionPolicies(mockScanExecutionPoliciesResponse);
 const defaultRequestHandlers = {
-  networkPolicies: networkPolicies(mockNetworkPoliciesResponse),
+  networkPolicies: networkPoliciesSpy,
   scanExecutionPolicies: scanExecutionPoliciesSpy,
 };
 const pendingHandler = jest.fn(() => new Promise(() => {}));
@@ -45,13 +46,19 @@ describe('PoliciesList component', () => {
   let requestHandlers;
 
   const factory = (mountFn = mountExtended) => (options = {}) => {
+    const { state = {}, handlers, ...wrapperOptions } = options;
+
     store = createStore();
-    const { state, handlers, ...wrapperOptions } = options;
-    Object.assign(store.state.networkPolicies, {
-      ...state,
+    store.replaceState({
+      ...store.state,
+      threatMonitoring: {
+        ...store.state.threatMonitoring,
+        environments,
+        currentEnvironmentId: environments[0].id,
+        ...state.threatMonitoring,
+      },
     });
-    store.state.threatMonitoring.environments = environments;
-    store.state.threatMonitoring.currentEnvironmentId = environments[0].id;
+
     requestHandlers = {
       ...defaultRequestHandlers,
       ...handlers,
@@ -260,8 +267,7 @@ describe('PoliciesList component', () => {
 
   describe('with allEnvironments enabled', () => {
     beforeEach(() => {
-      mountWrapper();
-      wrapper.vm.$store.state.threatMonitoring.allEnvironments = true;
+      mountWrapper({ state: { threatMonitoring: { allEnvironments: true } } });
     });
 
     it('renders environments column', () => {
@@ -312,7 +318,26 @@ describe('PoliciesList component', () => {
     });
   });
 
-  describe('given no environement', () => {
+  describe('given loading environment', () => {
+    beforeEach(() => {
+      mountWrapper({
+        propsData: {
+          hasEnvironment: true,
+        },
+        state: {
+          threatMonitoring: {
+            isLoadingEnvironments: true,
+          },
+        },
+      });
+    });
+
+    it('does not make a request for network policies', () => {
+      expect(networkPoliciesSpy).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('given no environments', () => {
     beforeEach(() => {
       mountWrapper({
         propsData: {
@@ -321,8 +346,12 @@ describe('PoliciesList component', () => {
       });
     });
 
+    it('does not make a request for network policies', () => {
+      expect(networkPoliciesSpy).not.toHaveBeenCalled();
+    });
+
     it('does not render default network policies', () => {
-      expect(findPolicyStatusCells()).toHaveLength(3);
+      expect(findPolicyStatusCells()).toHaveLength(1);
     });
   });
 });