ui: Fixes DC switching when blocking queries are enabled (#6808)

This is the same fix as #6555 but for the 1.7 version of the UI with additional nspace support
hashicorp · Nov 19, 2019 · b043d57 · b043d57
1 parent 41ab816
commit b043d57
Show file tree

Hide file tree

Showing 20 changed files with 159 additions and 28 deletions.
diff --git a/ui-v2/app/serializers/application.js b/ui-v2/app/serializers/application.js
@@ -5,6 +5,8 @@ import config from 'consul-ui/config/environment';
 import {
   HEADERS_SYMBOL as HTTP_HEADERS_SYMBOL,
   HEADERS_INDEX as HTTP_HEADERS_INDEX,
+  HEADERS_DATACENTER as HTTP_HEADERS_DATACENTER,
+  HEADERS_NAMESPACE as HTTP_HEADERS_NAMESPACE,
 } from 'consul-ui/utils/http/consul';
 import { FOREIGN_KEY as DATACENTER_KEY } from 'consul-ui/models/dc';
 import { NSPACE_KEY } from 'consul-ui/models/nspace';
@@ -17,12 +19,21 @@ const map = function(obj, cb) {
   return obj.map(cb);
 };
 
-const attachHeaders = function(headers, body) {
+const attachHeaders = function(headers, body, query = {}) {
   // lowercase everything incase we get browser inconsistencies
   const lower = {};
   Object.keys(headers).forEach(function(key) {
     lower[key.toLowerCase()] = headers[key];
   });
+  // Add a 'pretend' Datacenter/Nspace header, they are not headers
+  // the come from the request but we add them here so we can use them later
+  // for store reconciliation
+  if (typeof query.dc !== 'undefined') {
+    lower[HTTP_HEADERS_DATACENTER.toLowerCase()] = query.dc;
+  }
+  lower[HTTP_HEADERS_NAMESPACE.toLowerCase()] =
+    typeof query.ns !== 'undefined' ? query.ns : config.CONSUL_NSPACES_UNDEFINED_NAME;
+  //
   body[HTTP_HEADERS_SYMBOL] = lower;
   return body;
 };
@@ -36,12 +47,16 @@ export default Serializer.extend({
   ),
   respondForQuery: function(respond, query) {
     return respond((headers, body) =>
-      attachHeaders(headers, map(body, this.fingerprint(this.primaryKey, this.slugKey, query.dc)))
+      attachHeaders(
+        headers,
+        map(body, this.fingerprint(this.primaryKey, this.slugKey, query.dc)),
+        query
+      )
     );
   },
   respondForQueryRecord: function(respond, query) {
     return respond((headers, body) =>
-      attachHeaders(headers, this.fingerprint(this.primaryKey, this.slugKey, query.dc)(body))
+      attachHeaders(headers, this.fingerprint(this.primaryKey, this.slugKey, query.dc)(body), query)
     );
   },
   respondForCreateRecord: function(respond, serialized, data) {
@@ -127,6 +142,8 @@ export default Serializer.extend({
   normalizeMeta: function(store, primaryModelClass, headers, payload, id, requestType) {
     const meta = {
       cursor: headers[HTTP_HEADERS_INDEX],
+      dc: headers[HTTP_HEADERS_DATACENTER.toLowerCase()],
+      nspace: headers[HTTP_HEADERS_NAMESPACE.toLowerCase()],
     };
     if (requestType === 'query') {
       meta.date = this.timestamp();

diff --git a/ui-v2/app/services/repository/type/event-source.js b/ui-v2/app/services/repository/type/event-source.js
@@ -18,9 +18,13 @@ const createProxy = function(repo, find, settings, cache, serialize = JSON.strin
     if (typeof meta.date !== 'undefined') {
       // unload anything older than our current sync date/time
       store.peekAll(repo.getModelName()).forEach(function(item) {
-        const date = get(item, 'SyncTime');
-        if (typeof date !== 'undefined' && date != meta.date) {
-          store.unloadRecord(item);
+        const dc = get(item, 'Datacenter');
+        const nspace = get(item, 'Namespace');
+        if (dc === meta.dc && nspace === meta.nspace) {
+          const date = get(item, 'SyncTime');
+          if (typeof date !== 'undefined' && date != meta.date) {
+            store.unloadRecord(item);
+          }
         }
       });
     }

diff --git a/ui-v2/app/utils/http/consul.js b/ui-v2/app/utils/http/consul.js
@@ -1,5 +1,6 @@
 // TODO: Need to make all these headers capital case
 export const HEADERS_NAMESPACE = 'X-Consul-Namespace';
+export const HEADERS_DATACENTER = 'x-consul-datacenter';
 export const HEADERS_INDEX = 'x-consul-index';
 export const HEADERS_DIGEST = 'x-consul-contenthash';
 //

diff --git a/ui-v2/tests/acceptance/dc/services/dc-switch.feature b/ui-v2/tests/acceptance/dc/services/dc-switch.feature
@@ -0,0 +1,27 @@
+@setupApplicationTest
+Feature: dc / services / dc-switch : Switching Datacenters
+  Scenario: Seeing all services when switching datacenters
+    Given 2 datacenter models from yaml
+    ---
+      - dc-1
+      - dc-2
+    ---
+    And 6 service models
+    When I visit the services page for yaml
+    ---
+      dc: dc-1
+    ---
+    Then the url should be /dc-1/services
+    Then I see 6 service models
+    When I click dc on the navigation
+    And I click dcs.1.name
+    Then the url should be /dc-2/services
+    Then I see 6 service models
+    When I click dc on the navigation
+    And I click dcs.0.name
+    Then the url should be /dc-1/services
+    Then I see 6 service models
+    When I click dc on the navigation
+    And I click dcs.1.name
+    Then the url should be /dc-2/services
+    Then I see 6 service models
diff --git a/ui-v2/tests/acceptance/steps/dc/services/dc-switch-steps.js b/ui-v2/tests/acceptance/steps/dc/services/dc-switch-steps.js
@@ -0,0 +1,10 @@
+import steps from '../../steps';
+
+// step definitions that are shared between features should be moved to the
+// tests/acceptance/steps/steps.js file
+
+export default function(assert) {
+  return steps(assert).then('I should find a file', function() {
+    assert.ok(true, this.step);
+  });
+}
diff --git a/ui-v2/tests/integration/serializers/acl-test.js b/ui-v2/tests/integration/serializers/acl-test.js
@@ -1,7 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
-import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
+import {
+  HEADERS_SYMBOL as META,
+  HEADERS_DATACENTER as DC,
+  HEADERS_NAMESPACE as NSPACE,
+} from 'consul-ui/utils/http/consul';
 module('Integration | Serializer | acl', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
@@ -43,7 +47,10 @@ module('Integration | Serializer | acl', function(hooks) {
     return get(request.url).then(function(payload) {
       const expected = Object.assign({}, payload[0], {
         Datacenter: dc,
-        [META]: {},
+        [META]: {
+          [DC.toLowerCase()]: dc,
+          [NSPACE.toLowerCase()]: nspace,
+        },
         // TODO: default isn't required here, once we've
         // refactored out our Serializer this can go
         Namespace: nspace,

diff --git a/ui-v2/tests/integration/serializers/intention-test.js b/ui-v2/tests/integration/serializers/intention-test.js
@@ -1,7 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
-import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
+import {
+  HEADERS_SYMBOL as META,
+  HEADERS_DATACENTER as DC,
+  HEADERS_NAMESPACE as NSPACE,
+} from 'consul-ui/utils/http/consul';
 module('Integration | Serializer | intention', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
@@ -43,7 +47,10 @@ module('Integration | Serializer | intention', function(hooks) {
     return get(request.url).then(function(payload) {
       const expected = Object.assign({}, payload, {
         Datacenter: dc,
-        [META]: {},
+        [META]: {
+          [DC.toLowerCase()]: dc,
+          [NSPACE.toLowerCase()]: nspace,
+        },
         // TODO: default isn't required here, once we've
         // refactored out our Serializer this can go
         Namespace: nspace,

diff --git a/ui-v2/tests/integration/serializers/kv-test.js b/ui-v2/tests/integration/serializers/kv-test.js
@@ -1,7 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
-import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
+import {
+  HEADERS_SYMBOL as META,
+  HEADERS_DATACENTER as DC,
+  HEADERS_NAMESPACE as NSPACE,
+} from 'consul-ui/utils/http/consul';
 module('Integration | Serializer | kv', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
@@ -51,7 +55,10 @@ module('Integration | Serializer | kv', function(hooks) {
       return get(request.url).then(function(payload) {
         const expected = Object.assign({}, payload[0], {
           Datacenter: dc,
-          [META]: {},
+          [META]: {
+            [DC.toLowerCase()]: dc,
+            [NSPACE.toLowerCase()]: payload[0].Namespace || undefinedNspace,
+          },
           Namespace: payload[0].Namespace || undefinedNspace,
           uid: `["${payload[0].Namespace || undefinedNspace}","${dc}","${id}"]`,
         });

diff --git a/ui-v2/tests/integration/serializers/node-test.js b/ui-v2/tests/integration/serializers/node-test.js
@@ -1,7 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
-import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
+import {
+  HEADERS_SYMBOL as META,
+  HEADERS_DATACENTER as DC,
+  HEADERS_NAMESPACE as NSPACE,
+} from 'consul-ui/utils/http/consul';
 module('Integration | Serializer | node', function(hooks) {
   setupTest(hooks);
   const nspace = 'default';
@@ -44,7 +48,10 @@ module('Integration | Serializer | node', function(hooks) {
     return get(request.url).then(function(payload) {
       const expected = Object.assign({}, payload, {
         Datacenter: dc,
-        [META]: {},
+        [META]: {
+          [DC.toLowerCase()]: dc,
+          [NSPACE.toLowerCase()]: nspace,
+        },
         // TODO: default isn't required here, once we've
         // refactored out our Serializer this can go
         Namespace: nspace,

diff --git a/ui-v2/tests/integration/serializers/policy-test.js b/ui-v2/tests/integration/serializers/policy-test.js
@@ -1,7 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
-import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
+import {
+  HEADERS_SYMBOL as META,
+  HEADERS_DATACENTER as DC,
+  HEADERS_NAMESPACE as NSPACE,
+} from 'consul-ui/utils/http/consul';
 module('Integration | Serializer | policy', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
@@ -43,7 +47,10 @@ module('Integration | Serializer | policy', function(hooks) {
       return get(request.url).then(function(payload) {
         const expected = Object.assign({}, payload, {
           Datacenter: dc,
-          [META]: {},
+          [META]: {
+            [DC.toLowerCase()]: dc,
+            [NSPACE.toLowerCase()]: payload.Namespace || undefinedNspace,
+          },
           Namespace: payload.Namespace || undefinedNspace,
           uid: `["${payload.Namespace || undefinedNspace}","${dc}","${id}"]`,
         });

diff --git a/ui-v2/tests/integration/serializers/role-test.js b/ui-v2/tests/integration/serializers/role-test.js
@@ -1,7 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
-import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
+import {
+  HEADERS_SYMBOL as META,
+  HEADERS_DATACENTER as DC,
+  HEADERS_NAMESPACE as NSPACE,
+} from 'consul-ui/utils/http/consul';
 import { createPolicies } from 'consul-ui/tests/helpers/normalizers';
 
 module('Integration | Serializer | role', function(hooks) {
@@ -47,7 +51,10 @@ module('Integration | Serializer | role', function(hooks) {
         const expected = Object.assign({}, payload, {
           Datacenter: dc,
           Policies: createPolicies(payload),
-          [META]: {},
+          [META]: {
+            [DC.toLowerCase()]: dc,
+            [NSPACE.toLowerCase()]: payload.Namespace || undefinedNspace,
+          },
           Namespace: payload.Namespace || undefinedNspace,
           uid: `["${payload.Namespace || undefinedNspace}","${dc}","${id}"]`,
         });

diff --git a/ui-v2/tests/integration/serializers/service-test.js b/ui-v2/tests/integration/serializers/service-test.js
@@ -1,7 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
-import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
+import {
+  HEADERS_SYMBOL as META,
+  HEADERS_DATACENTER as DC,
+  HEADERS_NAMESPACE as NSPACE,
+} from 'consul-ui/utils/http/consul';
 module('Integration | Serializer | service', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
@@ -47,7 +51,10 @@ module('Integration | Serializer | service', function(hooks) {
       return get(request.url).then(function(payload) {
         const expected = {
           Datacenter: dc,
-          [META]: {},
+          [META]: {
+            [DC.toLowerCase()]: dc,
+            [NSPACE.toLowerCase()]: payload[0].Service.Namespace || undefinedNspace,
+          },
           Namespace: payload[0].Service.Namespace || undefinedNspace,
           uid: `["${payload[0].Service.Namespace || undefinedNspace}","${dc}","${id}"]`,
           Name: id,

diff --git a/ui-v2/tests/integration/serializers/session-test.js b/ui-v2/tests/integration/serializers/session-test.js
@@ -1,7 +1,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
-import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
+import { HEADERS_SYMBOL as META, HEADERS_DATACENTER as DC } from 'consul-ui/utils/http/consul';
 module('Integration | Adapter | session | response', function(hooks) {
   setupTest(hooks);
   const dc = 'dc-1';
@@ -48,7 +48,9 @@ module('Integration | Adapter | session | response', function(hooks) {
       return get(request.url).then(function(payload) {
         const expected = Object.assign({}, payload[0], {
           Datacenter: dc,
-          [META]: {},
+          [META]: {
+            [DC.toLowerCase()]: dc,
+          },
           Namespace: payload[0].Namespace || undefinedNspace,
           uid: `["${payload[0].Namespace || undefinedNspace}","${dc}","${id}"]`,
         });

diff --git a/ui-v2/tests/integration/serializers/token-test.js b/ui-v2/tests/integration/serializers/token-test.js
@@ -1,7 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
-import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
+import {
+  HEADERS_SYMBOL as META,
+  HEADERS_DATACENTER as DC,
+  HEADERS_NAMESPACE as NSPACE,
+} from 'consul-ui/utils/http/consul';
 
 import { createPolicies } from 'consul-ui/tests/helpers/normalizers';
 
@@ -47,7 +51,10 @@ module('Integration | Serializer | token', function(hooks) {
       return get(request.url).then(function(payload) {
         const expected = Object.assign({}, payload, {
           Datacenter: dc,
-          [META]: {},
+          [META]: {
+            [DC.toLowerCase()]: dc,
+            [NSPACE.toLowerCase()]: payload.Namespace || undefinedNspace,
+          },
           Namespace: payload.Namespace || undefinedNspace,
           uid: `["${payload.Namespace || undefinedNspace}","${dc}","${id}"]`,
           Policies: createPolicies(payload),

diff --git a/ui-v2/tests/integration/services/repository/node-test.js b/ui-v2/tests/integration/services/repository/node-test.js
@@ -64,6 +64,7 @@ test('findBySlug returns the correct data for item endpoint', function(assert) {
             uid: `["${nspace}","${dc}","${item.ID}"]`,
             meta: {
               cursor: undefined,
+              dc: dc,
             },
           });
         })

diff --git a/ui-v2/tests/integration/services/repository/service-test.js b/ui-v2/tests/integration/services/repository/service-test.js
@@ -91,6 +91,7 @@ const undefinedNspace = 'default';
             service.Namespace = payload.Namespace;
             service.meta = {
               cursor: undefined,
+              dc: dc,
             };
 
             return service;

diff --git a/ui-v2/tests/pages/components/page.js b/ui-v2/tests/pages/components/page.js
@@ -1,5 +1,5 @@
 import { clickable } from 'ember-cli-page-object';
-export default {
+const page = {
   navigation: ['services', 'nodes', 'kvs', 'acls', 'intentions', 'docs', 'settings'].reduce(
     function(prev, item, i, arr) {
       const key = item;
@@ -23,3 +23,5 @@ export default {
     }
   ),
 };
+page.navigation.dc = clickable('[data-test-toggle-button="datacenters"]');
+export default page;
diff --git a/ui-v2/tests/pages/dc/services/index.js b/ui-v2/tests/pages/dc/services/index.js
@@ -6,7 +6,9 @@ export default function(visitable, clickable, attribute, collection, page, filte
       service: clickable('a'),
       externalSource: attribute('data-test-external-source', 'a span'),
     }),
-    dcs: collection('[data-test-datacenter-picker]'),
+    dcs: collection('[data-test-datacenter-picker]', {
+      name: clickable('a'),
+    }),
     navigation: page.navigation,
     filter: filter,
   };

diff --git a/ui-v2/tests/steps.js b/ui-v2/tests/steps.js
@@ -46,7 +46,7 @@ export default function(assert, library, pages, utils) {
           if (isNaN(parseInt(prop))) {
             return (obj = obj[prop]);
           } else {
-            return (obj = obj.objectAt(prop));
+            return (obj = obj.objectAt(parseInt(prop)));
           }
         }) && obj
       );