serialization fix

Author: pkazmierczak

pnpm-lock.yaml

@@ -4,21 +4,38 @@ packages:
 autoInstallPeers: false
 
 overrides:
-  '@babel/plugin-transform-modules-systemjs@>=7.12.0 <=7.29.3': '>=7.29.4'
-  '@babel/runtime@<7.26.10': '>=7.26.10'
-  '@glimmer/component': ^2.1.1
-  ansi-html@<0.0.8: '>=0.0.8'
-  basic-ftp@<=5.3.0: '>=5.3.1'
-  diff@>=6.0.0 <8.0.3: '>=8.0.3'
-  fast-uri@<=3.1.1: '>=3.1.2'
-  flatted@<=3.4.1: '>=3.4.2'
-  follow-redirects@<=1.15.11: '>=1.16.0'
-  ip-address@<=10.1.0: '>=10.1.1'
-  picomatch@<2.3.2: '>=2.3.2'
-  picomatch@>=4.0.0 <4.0.4: '>=4.0.4'
-  socket.io-parser@>=4.0.0 <4.2.6: '>=4.2.6'
-  tmp@<=0.2.3: '>=0.2.4'
-  uuid@<14.0.0: '>=14.0.0'
+  "@babel/plugin-transform-modules-systemjs@>=7.12.0 <=7.29.3": ">=7.29.4"
+  "@babel/runtime@<7.26.10": ">=7.26.10"
+  "@ember/string": 4.0.1
+  "@glimmer/component": ^2.1.1
+  ember-inflector: 6.0.0
+  ansi-html@<0.0.8: ">=0.0.8"
+  basic-ftp@<=5.3.0: ">=5.3.1"
+  diff@>=6.0.0 <8.0.3: ">=8.0.3"
+  fast-uri@<=3.1.1: ">=3.1.2"
+  flatted@<=3.4.1: ">=3.4.2"
+  follow-redirects@<=1.15.11: ">=1.16.0"
+  ip-address@<=10.1.0: ">=10.1.1"
+  picomatch@<2.3.2: ">=2.3.2"
+  picomatch@>=4.0.0 <4.0.4: ">=4.0.4"
+  socket.io-parser@>=4.0.0 <4.2.6: ">=4.2.6"
+  tmp@<=0.2.3: ">=0.2.4"
+  uuid@<14.0.0: ">=14.0.0"
+
+peerDependencyRules:
+  allowedVersions:
+    # ember-data 4.12.x still declares @ember/string ^3, but our app uses v4
+    "ember-data>@ember/string": "^4.0.0"
+    "@ember-data/store>@ember/string": "^4.0.0"
+    "@ember-data/model>@ember/string": "^4.0.0"
+    "@ember-data/adapter>@ember/string": "^4.0.0"
+    "@ember-data/serializer>@ember/string": "^4.0.0"
+    "@ember-data/debug>@ember/string": "^4.0.0"
+    "@ember-data/legacy-compat>@ember/string": "^4.0.0"
+    # Older addons declare narrow peers; we run ember-source 6.x / ember-concurrency 4.x
+    ember-source: "^6.0.0"
+    ember-concurrency: "^4.0.0"
+    ember-inflector: ">=4.0.0"
 
 publicHoistPattern:
   - ember-source

pnpm-workspace.yaml

@@ -18,7 +18,7 @@ export default class NetworkSerializer extends ApplicationSerializer {
   normalize(typeHash, hash) {
     const ip = hash.IP;
 
-    if (isIPv6(ip)) {
+    if (ip && isIPv6(ip)) {
       hash.IP = `[${ip}]`;
     }
 

ui/app/serializers/network.js

@@ -16,7 +16,7 @@ export default class PortSerializer extends ApplicationSerializer {
   normalize(typeHash, hash) {
     const ip = hash.HostIP;
 
-    if (isIPv6(ip)) {
+    if (ip && isIPv6(ip)) {
       hash.HostIP = `[${ip}]`;
     }
 

ui/app/serializers/port.js

@@ -16,6 +16,13 @@ const isTest = environment === 'test';
 
 export default function (defaults) {
   const app = new EmberApp(defaults, {
+    '@embroider/macros': {
+      setConfig: {
+        '@ember-data/store': {
+          polyfillUUID: true,
+        },
+      },
+    },
     emberData: {
       deprecations: {
         // New projects can safely leave this deprecation disabled.

ui/ember-cli-build.mjs

@@ -64,7 +64,6 @@
     "@hashicorp/design-system-components": "4.13.0",
     "@nullvoxpopuli/ember-composable-helpers": "^5.3.1",
     "@nullvoxpopuli/legacy-prototype-extensions": "^0.1.0",
-
     "@tsconfig/ember": "^3.0.12",
     "@types/qunit": "^2.19.13",
     "@types/rsvp": "^4.0.9",
@@ -113,6 +112,7 @@
     "ember-concurrency": "^4.0.6",
     "ember-copy": "^2.0.1",
     "ember-data": "~4.12.8",
+    "@ember-data/store": "~4.12.8",
     "ember-data-model-fragments": "7.0.3",
     "ember-decorators": "^6.1.1",
     "ember-exam": "10.1.0",

ui/package.json

@@ -33,4 +33,15 @@ module('Unit | Serializer | Network', function (hooks) {
     const { data } = this.subject().normalize(NetworkModel, original);
     assert.deepEqual(data.attributes.ip, `[${ip}]`);
   });
+
+  test('missing IP does not throw', async function (assert) {
+    const original = {
+      ReservedPorts: [{ Label: 'http', Value: 80 }],
+    };
+
+    assert.deepEqual(
+      this.subject().normalize(NetworkModel, original).data.attributes.ip,
+      undefined,
+    );
+  });
 });

ui/tests/unit/serializers/network-test.js

@@ -0,0 +1,41 @@
+/**
+ * Copyright IBM Corp. 2015, 2025
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+import PortModel from 'nomad-ui/models/port';
+
+module('Unit | Serializer | Port', function (hooks) {
+  setupTest(hooks);
+  hooks.beforeEach(function () {
+    this.store = this.owner.lookup('service:store');
+    this.subject = () => this.store.serializerFor('port');
+  });
+
+  test('v4 HostIPs are passed through', async function (assert) {
+    const ip = '10.0.13.12';
+    const original = { HostIP: ip };
+
+    const { data } = this.subject().normalize(PortModel, original);
+    assert.deepEqual(data.attributes.hostIp, ip);
+  });
+
+  test('v6 HostIPs are wrapped in square brackets', async function (assert) {
+    const ip = '2001:0dac:aba3:0000:0000:8a2e:0370:7334';
+    const original = { HostIP: ip };
+
+    const { data } = this.subject().normalize(PortModel, original);
+    assert.deepEqual(data.attributes.hostIp, `[${ip}]`);
+  });
+
+  test('missing HostIP does not throw', async function (assert) {
+    const original = { Label: 'http', Value: 80 };
+
+    assert.deepEqual(
+      this.subject().normalize(PortModel, original).data.attributes.hostIp,
+      undefined,
+    );
+  });
+});