nayota-show-sdk 1.3.86 → 1.3.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nayota-show-sdk",
-  "version": "1.3.86",
+  "version": "1.3.87",
   "description": "nayota-show-server rest-api",
   "type": "module",
   "main": "index.js",

package/utils/iot-module-specs.js

@@ -249,12 +249,25 @@ function mapIotComponentsToLegacy(item = {}) {
   })
 }
 
-function normalizeHierarchyFloorPlan(data = {}) {
-  if (data.floorPlan) {
-    return data.floorPlan
+function normalizeHierarchyField(data = {}, field) {
+  if (hasOwn(data, field)) {
+    return data[field]
   }
 
-  return getNestedValue(data, 'relationInfo.image')
+  return getNestedValue(data, `relationInfo.${field}`)
+}
+
+function normalizeLegacyHierarchyRelationInfo(item = {}) {
+  const relationInfo = removeUndefinedFields({
+    ...(item.relationInfo || {}),
+    image: getNestedValue(item, 'relationInfo.image') || item.floorPlan,
+    mapCenter: getNestedValue(item, 'relationInfo.mapCenter') || item.mapCenter,
+    latlng: getNestedValue(item, 'relationInfo.latlng') || item.latlng,
+    zooms: getNestedValue(item, 'relationInfo.zooms') || item.zooms,
+    powers: getNestedValue(item, 'relationInfo.powers') || item.powers
+  })
+
+  return Object.keys(relationInfo || {}).length ? relationInfo : undefined
 }
 
 function mapDepartsToIotBody(data = {}) {
@@ -265,39 +278,51 @@ function mapDepartsToIotBody(data = {}) {
     : hasFather
       ? resolveLegacyReference(data.father)
       : undefined
-  const metadata = mergeMetadata(data.metadata, {
-    mapCenter: data.mapCenter,
-    latlng: data.latlng,
-    zooms: data.zooms,
-    powers: data.powers,
-    departNo: data.departNo,
-    relationInfo: data.relationInfo
-  })
+  const metadata = omitKeys(data.metadata, [
+    'departTag',
+    'hierarchyTag',
+    'sort',
+    'level',
+    'fathers',
+    'mapCenter',
+    'latlng',
+    'zooms',
+    'powers',
+    'floorPlan',
+    'relationInfo',
+    'departNo'
+  ])
 
   return removeUndefinedFields({
     ...omitKeys(data, [
       '_id',
       'id',
       'father',
+      'departTag',
       'sort',
       'status',
-      'mapCenter',
-      'latlng',
-      'zooms',
-      'powers',
       'departNo'
     ]),
     code: data.code || data.departNo || undefined,
+    hierarchyTag: resolveLegacyReference(
+      data.hierarchyTag != null ? data.hierarchyTag : data.departTag
+    ),
     parentId,
     sortOrder: data.sortOrder != null ? data.sortOrder : data.sort,
     isActive: data.isActive != null ? data.isActive : data.status,
-    floorPlan: normalizeHierarchyFloorPlan(data),
+    mapCenter: normalizeHierarchyField(data, 'mapCenter'),
+    latlng: normalizeHierarchyField(data, 'latlng'),
+    zooms: normalizeHierarchyField(data, 'zooms'),
+    powers: normalizeHierarchyField(data, 'powers'),
+    floorPlan: data.floorPlan,
     metadata: Object.keys(metadata).length ? metadata : undefined
   })
 }
 
 function mapIotDepartsToLegacy(item = {}) {
   const entity = withLegacyId(item)
+  const relationInfo = normalizeLegacyHierarchyRelationInfo(entity)
+
   return removeUndefinedFields({
     ...entity,
     father: entity.father != null ? entity.father : entity.parentId,
@@ -306,9 +331,15 @@ function mapIotDepartsToLegacy(item = {}) {
       ? entity.level
       : Array.isArray(entity.ancestors) ? entity.ancestors.length : undefined,
     status: entity.status != null ? entity.status : entity.isActive,
-    sort: entity.sort != null ? entity.sort : (entity.sortOrder != null ? entity.sortOrder : getNestedValue(entity, 'metadata.sort')),
-    relationInfo: entity.relationInfo || getNestedValue(entity, 'metadata.relationInfo'),
-    departNo: entity.departNo || entity.code || getNestedValue(entity, 'metadata.departNo')
+    sort: entity.sort != null ? entity.sort : entity.sortOrder,
+    hierarchyTag: entity.hierarchyTag,
+    departTag: entity.departTag != null ? entity.departTag : entity.hierarchyTag,
+    mapCenter: entity.mapCenter,
+    latlng: entity.latlng,
+    zooms: entity.zooms,
+    powers: entity.powers,
+    relationInfo,
+    departNo: entity.departNo || entity.code
   })
 }
 

package/utils/iot-module-specs.test.js

@@ -190,6 +190,101 @@ describe('iotModuleSpecs departs hierarchy compatibility', () => {
     })
   })
 
+  test('writes hierarchy map fields as official v2 columns instead of metadata', () => {
+    const request = departs.updateOne.toRequest({
+      _id: 'e245a3f6-d2c7-4ce1-9e02-ba9bbb347ed7',
+      departTag: 'd4bd5d8b-163f-4df4-b8e2-6ee7de7a0e6d',
+      relationInfo: {
+        image: {
+          imagePath: 'upload.svg'
+        },
+        mapCenter: [120.1, 30.2],
+        latlng: [120.1, 30.2],
+        zooms: [17],
+        powers: ['read']
+      },
+      metadata: {
+        departTag: 'legacy-tag',
+        sort: 9,
+        level: 1,
+        fathers: ['legacy-parent'],
+        mapCenter: [1, 2],
+        latlng: [3, 4],
+        zooms: [5],
+        powers: ['legacy'],
+        keep: 'value'
+      }
+    })
+
+    expect(request.data.hierarchyTag).toBe('d4bd5d8b-163f-4df4-b8e2-6ee7de7a0e6d')
+    expect(request.data.mapCenter).toEqual([120.1, 30.2])
+    expect(request.data.latlng).toEqual([120.1, 30.2])
+    expect(request.data.zooms).toEqual([17])
+    expect(request.data.powers).toEqual(['read'])
+    expect(request.data.relationInfo).toEqual({
+      image: {
+        imagePath: 'upload.svg'
+      },
+      mapCenter: [120.1, 30.2],
+      latlng: [120.1, 30.2],
+      zooms: [17],
+      powers: ['read']
+    })
+    expect(request.data.metadata).toEqual({ keep: 'value' })
+  })
+
+  test('rebuilds legacy relationInfo from official hierarchy fields and ignores metadata fallbacks', () => {
+    const response = departs.list.fromResponse({
+      code: 0,
+      data: {
+        total: 1,
+        items: [
+          {
+            id: 'hierarchy-1',
+            name: '1F',
+            hierarchyTag: 'd4bd5d8b-163f-4df4-b8e2-6ee7de7a0e6d',
+            mapCenter: [120.1, 30.2],
+            latlng: [120.1, 30.2],
+            zooms: [17],
+            powers: ['read'],
+            floorPlan: {
+              imagePath: 'upload.svg'
+            },
+            metadata: {
+              mapCenter: [120.1, 30.2],
+              latlng: [120.1, 30.2],
+              zooms: [17],
+              powers: ['read'],
+              relationInfo: {
+                image: {
+                  imagePath: 'upload.svg'
+                }
+              },
+              departNo: 'building4'
+            }
+          }
+        ]
+      }
+    })
+
+    expect(response.data.rows[0].hierarchyTag).toBe('d4bd5d8b-163f-4df4-b8e2-6ee7de7a0e6d')
+    expect(response.data.rows[0].departTag).toBe('d4bd5d8b-163f-4df4-b8e2-6ee7de7a0e6d')
+    expect(response.data.rows[0].mapCenter).toEqual([120.1, 30.2])
+    expect(response.data.rows[0].latlng).toEqual([120.1, 30.2])
+    expect(response.data.rows[0].zooms).toEqual([17])
+    expect(response.data.rows[0].powers).toEqual(['read'])
+    expect(response.data.rows[0].relationInfo).toEqual({
+      image: {
+        imagePath: 'upload.svg'
+      },
+      mapCenter: [120.1, 30.2],
+      latlng: [120.1, 30.2],
+      zooms: [17],
+      powers: ['read']
+    })
+    expect(response.data.rows[0].departNo).toBeUndefined()
+  })
+
   test('keeps explicit legacy father null as root move', () => {
     const request = departs.updateOne.toRequest({
       _id: 'e245a3f6-d2c7-4ce1-9e02-ba9bbb347ed7',