diff --git a/ui-v2/app/utils/dom/event-source/index.js b/ui-v2/app/utils/dom/event-source/index.js index 668ce29335bb..0a431ea59bd3 100644 --- a/ui-v2/app/utils/dom/event-source/index.js +++ b/ui-v2/app/utils/dom/event-source/index.js @@ -11,7 +11,7 @@ import proxyFactory from 'consul-ui/utils/dom/event-source/proxy'; import firstResolverFactory from 'consul-ui/utils/dom/event-source/resolver'; import CallableEventSourceFactory from 'consul-ui/utils/dom/event-source/callable'; -import ReopenableEventSourceFactory from 'consul-ui/utils/dom/event-source/reopenable'; +import OpenableEventSourceFactory from 'consul-ui/utils/dom/event-source/openable'; import BlockingEventSourceFactory from 'consul-ui/utils/dom/event-source/blocking'; import StorageEventSourceFactory from 'consul-ui/utils/dom/event-source/storage'; @@ -70,8 +70,8 @@ switch (env('CONSUL_UI_REALTIME_RUNNER')) { // All The EventSource-i export const CallableEventSource = CallableEventSourceFactory(EventTarget, Promise, runner); -export const ReopenableEventSource = ReopenableEventSourceFactory(CallableEventSource); -export const BlockingEventSource = BlockingEventSourceFactory(ReopenableEventSource); +export const OpenableEventSource = OpenableEventSourceFactory(CallableEventSource); +export const BlockingEventSource = BlockingEventSourceFactory(OpenableEventSource); export const StorageEventSource = StorageEventSourceFactory(EventTarget, Promise); // various utils diff --git a/ui-v2/app/utils/dom/event-source/reopenable.js b/ui-v2/app/utils/dom/event-source/openable.js similarity index 94% rename from ui-v2/app/utils/dom/event-source/reopenable.js rename to ui-v2/app/utils/dom/event-source/openable.js index c1f362c5de4c..c2ae8afe844f 100644 --- a/ui-v2/app/utils/dom/event-source/reopenable.js +++ b/ui-v2/app/utils/dom/event-source/openable.js @@ -9,7 +9,7 @@ export default function(eventSource = EventSource) { super(...arguments); this.configuration = configuration; } - reopen() { + open() { switch (this.readyState) { case 3: // CLOSING this.readyState = 1; @@ -18,6 +18,7 @@ export default function(eventSource = EventSource) { eventSource.apply(this, [this.source, this.configuration]); break; } + return this; } }; } diff --git a/ui-v2/app/utils/dom/event-source/proxy.js b/ui-v2/app/utils/dom/event-source/proxy.js index 19f0d3d5cb04..bc3627aeda99 100644 --- a/ui-v2/app/utils/dom/event-source/proxy.js +++ b/ui-v2/app/utils/dom/event-source/proxy.js @@ -44,8 +44,8 @@ export default function(ObjProxy, ArrProxy, createListeners) { close: function() { return source.close(...arguments); }, - reopen: function() { - return source.reopen(...arguments); + open: function() { + return source.open(...arguments); }, willDestroy: function() { this.listeners.remove(); diff --git a/ui-v2/app/utils/dom/event-source/resolver.js b/ui-v2/app/utils/dom/event-source/resolver.js index a5984295aa78..fcab163506e4 100644 --- a/ui-v2/app/utils/dom/event-source/resolver.js +++ b/ui-v2/app/utils/dom/event-source/resolver.js @@ -7,7 +7,7 @@ export default function(P = Promise) { if (current != null) { // immediately resolve if we have previous cached data return P.resolve(current.data).then(function(cached) { - source.reopen(); + source.open(); return cached; }); } diff --git a/ui-v2/app/utils/dom/event-source/storage.js b/ui-v2/app/utils/dom/event-source/storage.js index b5cba3b618b0..26f2ab48b98e 100644 --- a/ui-v2/app/utils/dom/event-source/storage.js +++ b/ui-v2/app/utils/dom/event-source/storage.js @@ -15,7 +15,7 @@ export default function(EventTarget, P = Promise) { this.configuration = configuration; this.configuration.cursor = 1; this.dispatcher = configuration.dispatcher; - this.reopen(); + this.open(); } dispatchEvent() { if (this.readyState === 1) { diff --git a/ui-v2/tests/unit/utils/dom/event-source/index-test.js b/ui-v2/tests/unit/utils/dom/event-source/index-test.js index 0e99418ebeda..97ef95f9f54f 100644 --- a/ui-v2/tests/unit/utils/dom/event-source/index-test.js +++ b/ui-v2/tests/unit/utils/dom/event-source/index-test.js @@ -4,7 +4,7 @@ import { cache, resolve, CallableEventSource, - ReopenableEventSource, + OpenableEventSource, BlockingEventSource, StorageEventSource, } from 'consul-ui/utils/dom/event-source/index'; @@ -16,7 +16,7 @@ module('Unit | Utility | dom/event source/index'); test('it works', function(assert) { // All The EventSource assert.ok(typeof CallableEventSource === 'function'); - assert.ok(typeof ReopenableEventSource === 'function'); + assert.ok(typeof OpenableEventSource === 'function'); assert.ok(typeof BlockingEventSource === 'function'); assert.ok(typeof StorageEventSource === 'function'); diff --git a/ui-v2/tests/unit/utils/dom/event-source/reopenable-test.js b/ui-v2/tests/unit/utils/dom/event-source/openable-test.js similarity index 62% rename from ui-v2/tests/unit/utils/dom/event-source/reopenable-test.js rename to ui-v2/tests/unit/utils/dom/event-source/openable-test.js index 493669014082..3ed01a2b2377 100644 --- a/ui-v2/tests/unit/utils/dom/event-source/reopenable-test.js +++ b/ui-v2/tests/unit/utils/dom/event-source/openable-test.js @@ -1,8 +1,8 @@ -import domEventSourceReopenable from 'consul-ui/utils/dom/event-source/reopenable'; +import domEventSourceOpenable from 'consul-ui/utils/dom/event-source/openable'; import { module } from 'qunit'; import test from 'ember-sinon-qunit/test-support/test'; -module('Unit | Utility | dom/event-source/reopenable'); +module('Unit | Utility | dom/event-source/openable'); const createEventSource = function() { return class { @@ -17,30 +17,30 @@ const createEventSource = function() { close() {} }; }; -test('it creates an Reopenable class implementing EventSource', function(assert) { +test('it creates an Openable class implementing EventSource', function(assert) { const EventSource = createEventSource(); - const ReopenableEventSource = domEventSourceReopenable(EventSource); - assert.ok(ReopenableEventSource instanceof Function); - const source = new ReopenableEventSource(function() {}); + const OpenableEventSource = domEventSourceOpenable(EventSource); + assert.ok(OpenableEventSource instanceof Function); + const source = new OpenableEventSource(function() {}); assert.ok(source instanceof EventSource); }); test('it reopens the event source when reopen is called', function(assert) { const callable = this.stub(); const EventSource = createEventSource(); - const ReopenableEventSource = domEventSourceReopenable(EventSource); - const source = new ReopenableEventSource(callable); + const OpenableEventSource = domEventSourceOpenable(EventSource); + const source = new OpenableEventSource(callable); assert.equal(source.readyState, 1); // first automatic EventSource `open` assert.ok(callable.calledOnce); source.readyState = 3; - source.reopen(); + source.open(); // still only called once as it hasn't completely closed yet // therefore is just opened by resetting the readyState assert.ok(callable.calledOnce); assert.equal(source.readyState, 1); // properly close the source source.readyState = 2; - source.reopen(); - // this time it is reopened via a recall of the callable + source.open(); + // this time it is opened via a recall of the callable assert.ok(callable.calledTwice); });