Merge branch '5351-geo-don-t-block-edit-and-remove-buttons-while-status-is-loading' into 'master'

Resolve "Geo: Don't block "Edit" and "Remove" buttons while status is loading"

Closes #5351

See merge request gitlab-org/gitlab-ee!5526

ee/app/assets/javascripts/geo_nodes/components/app.vue

 <script>
 import { s__ } from '~/locale';
 import Flash from '~/flash';
-import statusCodes from '~/lib/utils/http_status';
 import loadingIcon from '~/vue_shared/components/loading_icon.vue';
 import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
 import SmartInterval from '~/smart_interval';
@@ -116,7 +115,7 @@ export default {
           );
         })
         .catch(err => {
-          if (err.response && err.response.status === statusCodes.NOT_FOUND) {
+          if (err.response && err.response.data) {
             this.store.setNodeDetails(nodeId, {
               geo_node_id: nodeId,
               health: err.message,

ee/changelogs/unreleased/5351-geo-don-t-block-edit-and-remove-buttons-while-status-is-loading.yml

+---
+title: Ability to edit, disable or remove Geo Nodes is now always available
+merge_request:
+author:
+type: changed

spec/javascripts/geo_nodes/components/app_spec.js

@@ -124,21 +124,25 @@ describe('AppComponent', () => {
         }, 0);
       });
 
-      it('emits `nodeDetailsLoadFailed` event on failure', (done) => {
+      it('emits `nodeDetailsLoaded` event with fake nodeDetails object on 404 failure', (done) => {
         spyOn(eventHub, '$emit');
-        mock.onGet(mockNode.statusPath).reply(500, {});
+        mock.onGet(mockNode.statusPath).reply(404, {});
         spyOn(vm.service, 'getGeoNodeDetails').and.callThrough();
 
         vm.fetchNodeDetails(mockNode);
         setTimeout(() => {
-          expect(eventHub.$emit).toHaveBeenCalledWith('nodeDetailsLoadFailed', mockNode.id, jasmine.any(Object));
+          expect(eventHub.$emit).toHaveBeenCalledWith('nodeDetailsLoaded', jasmine.any(Object));
+          const nodeDetails = vm.store.state.nodeDetails['1'];
+          expect(nodeDetails).toBeDefined();
+          expect(nodeDetails.syncStatusUnavailable).toBe(true);
+          expect(nodeDetails.health).toBe('Request failed with status code 404');
           done();
         }, 0);
       });
 
-      it('emits `nodeDetailsLoaded` event with fake nodeDetails object on 404 failure', (done) => {
+      it('emits `nodeDetailsLoaded` event with fake nodeDetails object on 500 failure', (done) => {
         spyOn(eventHub, '$emit');
-        mock.onGet(mockNode.statusPath).reply(404, {});
+        mock.onGet(mockNode.statusPath).reply(500, {});
         spyOn(vm.service, 'getGeoNodeDetails').and.callThrough();
 
         vm.fetchNodeDetails(mockNode);
@@ -147,7 +151,19 @@ describe('AppComponent', () => {
           const nodeDetails = vm.store.state.nodeDetails['1'];
           expect(nodeDetails).toBeDefined();
           expect(nodeDetails.syncStatusUnavailable).toBe(true);
-          expect(nodeDetails.health).toBe('Request failed with status code 404');
+          expect(nodeDetails.health).toBe('Request failed with status code 500');
+          done();
+        }, 0);
+      });
+
+      it('emits `nodeDetailsLoadFailed` event on failure when there is no response', (done) => {
+        spyOn(eventHub, '$emit');
+        mock.onGet(mockNode.statusPath).reply(500, null);
+        spyOn(vm.service, 'getGeoNodeDetails').and.callThrough();
+
+        vm.fetchNodeDetails(mockNode);
+        setTimeout(() => {
+          expect(eventHub.$emit).toHaveBeenCalledWith('nodeDetailsLoadFailed', mockNode.id, jasmine.any(Object));
           done();
         }, 0);
       });