Fix port preflight closure actions

Author: chen21019

app/components/form-ports/component.js

@@ -212,6 +212,18 @@ export default Ember.Component.extend({
     },
   },
 
+  invokePassedAction(name, value) {
+    let action = this.get(name);
+
+    if ( typeof action === 'function' ) {
+      return action(value);
+    }
+
+    if ( action ) {
+      return this.sendAction(name, value);
+    }
+  },
+
   portsArrayDidChange: function() {
     let out = [];
     (this.get('portsArray') || []).forEach((row) => {
@@ -252,8 +264,8 @@ export default Ember.Component.extend({
     });
 
     this.set('portsAsStrArray', out);
-    this.sendAction('changed', this.get('portsArray'));
-    this.sendAction('changedStr', this.get('portsAsStrArray'));
+    this.invokePassedAction('changed', this.get('portsArray'));
+    this.invokePassedAction('changedStr', this.get('portsAsStrArray'));
   }.observes('portsArray.@each.{bindAddress,public,private,protocol}'),
 
   validate: function() {
@@ -462,7 +474,7 @@ export default Ember.Component.extend({
       preflightStatusMessage: this.statusMessage(status, messageKey, result),
     });
     this.validate();
-    this.sendAction('preflightChanged', {
+    this.invokePassedAction('preflightChanged', {
       status,
       pending: status === 'checking',
       blocked: status === 'blocked',

app/components/new-container/component.js

@@ -127,7 +127,7 @@ export default Ember.Component.extend(NewOrEdit, SelectTab, {
 
     portPreflightChanged(state) {
       this.set('portPreflightState', state || {status: 'idle', pending: false, blocked: false});
-      this.sendAction('preflightChanged', this.get('portPreflightState'));
+      this.invokePassedAction('preflightChanged', this.get('portPreflightState'));
     },
 
     sidekickPortPreflightChanged(key, state) {
@@ -146,6 +146,18 @@ export default Ember.Component.extend(NewOrEdit, SelectTab, {
     },
   },
 
+  invokePassedAction(name, value) {
+    let action = this.get(name);
+
+    if ( typeof action === 'function' ) {
+      return action(value);
+    }
+
+    if ( action ) {
+      return this.sendAction(name, value);
+    }
+  },
+
   init() {
     this._super(...arguments);
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pasturestack/web-console",
-  "version": "1.6.56-pasturestack.53",
+  "version": "1.6.56-pasturestack.54",
   "private": true,
   "description": "PastureStack browser console for the compatible control platform.",
   "repository": {

package.json

@@ -41,8 +41,8 @@ with open('package.json', encoding='utf-8') as f:
     print(json.load(f).get('version', ''))
 PY
 )
-if [[ "$version" != "1.6.56-pasturestack.53" ]]; then
-  echo "UNEXPECTED_UI_ARTIFACT_VERSION version=$version expected=1.6.56-pasturestack.53"
+if [[ "$version" != "1.6.56-pasturestack.54" ]]; then
+  echo "UNEXPECTED_UI_ARTIFACT_VERSION version=$version expected=1.6.56-pasturestack.54"
   failures=$((failures + 1))
 fi
 

scripts/check-modernization-blockers

@@ -141,4 +141,4 @@ if [[ -n ${PASTURESTACK_PRIVATE_MARKER:-} ]] && grep -RInF -- "$PASTURESTACK_PRI
 fi
 
 printf 'UI_CONSOLE_WORKSPACE_OK version=%s persistence=%s cross_tab=%s\n' \
-  1.6.56-pasturestack.53 browser-session broker-broadcast
+  1.6.56-pasturestack.54 browser-session broker-broadcast

scripts/check-ui-console-workspace

@@ -28,6 +28,9 @@ for (const marker of [
   'stackId',
   'runtimeProbe: true',
   'host_network_ignores_published_port',
+  "this.invokePassedAction('changed'",
+  "this.invokePassedAction('changedStr'",
+  "this.invokePassedAction('preflightChanged'",
 ]) {
   if (!component.includes(marker)) failures.push(`FORM_PORT_PREFLIGHT_MISSING=${marker}`);
 }
@@ -46,6 +49,7 @@ for (const marker of [
   'hasSidekickPortPreflightPending',
   'hasSidekickPortPreflightBlocked',
   'saveDisabled:',
+  "this.invokePassedAction('preflightChanged'",
 ]) {
   if (!parent.includes(marker)) failures.push(`NEW_CONTAINER_PREFLIGHT_MISSING=${marker}`);
 }
@@ -74,13 +78,15 @@ for (const marker of [
   'stopped owner is a warning and does not block saving',
   'host networking checks the container port',
   'a late older response cannot replace the newest result',
+  'closure callbacks are invoked directly and missing optional callbacks are ignored',
 ]) {
   if (!componentTest.includes(marker)) failures.push(`PORT_PREFLIGHT_TEST_MISSING=${marker}`);
 }
 
 for (const marker of [
   'primary check disables save only while pending or blocked',
   'sidekick checks participate in the parent save lock',
+  'preflight closure callback is invoked without legacy sendAction',
 ]) {
   if (!parentTest.includes(marker)) failures.push(`PORT_PREFLIGHT_PARENT_TEST_MISSING=${marker}`);
 }

scripts/check-ui-port-preflight.js

@@ -38,13 +38,54 @@ function createComponent(project, properties) {
       projects: Ember.Object.create({current: project}),
       initialPorts: Ember.A(),
       schedulePortPreflight() {},
-      sendAction() {},
     }, properties || {}), 'component');
   });
 
   return component;
 }
 
+test('closure callbacks are invoked directly and missing optional callbacks are ignored', function(assert) {
+  let changedRows;
+  let changedSpecs;
+  let preflightState;
+  let component = createComponent(null, {
+    changed(value) {
+      changedRows = value;
+    },
+    changedStr(value) {
+      changedSpecs = value;
+    },
+    preflightChanged(value) {
+      preflightState = value;
+    },
+    sendAction() {
+      assert.ok(false, 'closure callbacks must not be routed through legacy sendAction');
+    },
+  });
+  let row = portRow('8080', '80');
+
+  Ember.run(() => component.set('portsArray', Ember.A([row])));
+  component.portsArrayDidChange();
+  component.applyPreflightState('available', [], null, {
+    eligibleHostCount: 1,
+    availableHostCount: 1,
+  });
+
+  assert.strictEqual(changedRows, component.get('portsArray'), 'passes the live row array');
+  assert.deepEqual(changedSpecs, ['8080:80/tcp'], 'passes the serialized port specs');
+  assert.equal(preflightState.status, 'available', 'passes the preflight result');
+
+  Ember.run(() => component.setProperties({
+    changed: null,
+    changedStr: null,
+    preflightChanged: null,
+  }));
+  component.portsArrayDidChange();
+  component.applyPreflightState('available', [], null, null);
+  assert.ok(true, 'missing optional callbacks do not throw');
+  destroyOwned(component);
+});
+
 function projectWithAction(callback) {
   return Ember.Object.create({
     actionLinks: {portpreflight: '/v2-beta/projects/1a5?action=portpreflight'},

tests/unit/components/form-ports-test.js

@@ -30,13 +30,37 @@ function createComponent() {
       primaryResource: service,
       primaryService: service,
       isService: true,
-      sendAction() {},
     }, 'component');
   });
 
   return component;
 }
 
+test('preflight closure callback is invoked without legacy sendAction', function(assert) {
+  let received;
+  let component = createComponent();
+
+  Ember.run(() => component.set('preflightChanged', (state) => {
+    received = state;
+  }));
+  Ember.run(() => component.send('portPreflightChanged', {
+    status: 'available',
+    pending: false,
+    blocked: false,
+  }));
+
+  assert.equal(received.status, 'available', 'passes the state to the closure callback');
+
+  Ember.run(() => component.set('preflightChanged', null));
+  Ember.run(() => component.send('portPreflightChanged', {
+    status: 'warning',
+    pending: false,
+    blocked: false,
+  }));
+  assert.ok(true, 'missing optional callback does not throw');
+  destroyOwned(component);
+});
+
 test('primary check disables save only while pending or blocked', function(assert) {
   let component = createComponent();