nayota-show-sdk 1.3.80 → 1.3.82

package/package.json

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

package/utils/iot-module-specs.js

@@ -90,7 +90,20 @@ function mapAreaToIotQuery(query = {}) {
   return next
 }
 
-function mapAreaToIotBody(data = {}) {
+function resolveOptionalLegacyReference(data, primaryKey, legacyKey) {
+  if (hasOwn(data, primaryKey)) {
+    return data[primaryKey]
+  }
+
+  if (hasOwn(data, legacyKey)) {
+    return resolveLegacyReference(data[legacyKey])
+  }
+
+  return undefined
+}
+
+function mapAreaToIotBody(data = {}, options = {}) {
+  const isPartial = options.partial === true
   const metadata = mergeMetadata(data.metadata, {
     legacyType: data.type
   })
@@ -108,13 +121,13 @@ function mapAreaToIotBody(data = {}) {
       'relationInfo',
       'centerCoordinate'
     ]),
-    code: data.code || fallbackCode(data.name || data._id, 'SPACE'),
-    spaceType: data.spaceType || 'zone',
+    code: data.code || (isPartial ? undefined : fallbackCode(data.name || data._id, 'SPACE')),
+    spaceType: data.spaceType || (isPartial ? undefined : 'zone'),
     hierarchyId: data.hierarchyId || data.depart,
     isVisible: data.isVisible != null ? data.isVisible : data.visible,
     area: data.area != null ? data.area : data.areaSize,
-    areaClassId: data.areaClassId || resolveLegacyReference(data.areaClass),
-    targetHierarchyId: data.targetHierarchyId || resolveLegacyReference(data.targetDepartId),
+    areaClassId: resolveOptionalLegacyReference(data, 'areaClassId', 'areaClass'),
+    targetHierarchyId: resolveOptionalLegacyReference(data, 'targetHierarchyId', 'targetDepartId'),
     centerPoint: normalizeAreaCenterPoint(data),
     floorPlan: normalizeAreaFloorPlan(data),
     statisticsJson: parseLegacyJson(data.statisticsJson),
@@ -739,6 +752,35 @@ function mapIotDeviceClassToLegacy(item = {}) {
   })
 }
 
+const LEGACY_CAMERA_DEVICE_CLASS = Object.freeze({
+  _id: 'camera',
+  id: 'camera',
+  name: '摄像头',
+  icon: '摄像头监控',
+  type: 'camera'
+})
+
+function appendLegacyCameraDeviceClass(response = {}) {
+  const rows = Array.isArray(response?.data?.rows) ? response.data.rows : []
+  const hasCameraType = rows.some(item => getLegacyId(item) === LEGACY_CAMERA_DEVICE_CLASS._id)
+
+  if (hasCameraType) {
+    return response
+  }
+
+  return {
+    ...response,
+    data: {
+      ...response.data,
+      total: Number(response?.data?.total ?? rows.length) + 1,
+      rows: [
+        ...rows,
+        { ...LEGACY_CAMERA_DEVICE_CLASS }
+      ]
+    }
+  }
+}
+
 function createBasicCrudOperations({
   resource,
   mapListQuery = query => query,
@@ -764,7 +806,7 @@ function createBasicCrudOperations({
         return {
           url: resource,
           method: 'post',
-          data: mapWritePayload(data)
+          data: mapWritePayload(data, { partial: false, action: 'create' })
         }
       },
       fromResponse(response) {
@@ -787,7 +829,7 @@ function createBasicCrudOperations({
         return {
           url: `${resource}/${getLegacyId(data)}`,
           method: 'patch',
-          data: omitKeys(mapWritePayload(data), ['id', '_id'])
+          data: omitKeys(mapWritePayload(data, { partial: true, action: 'updateOne' }), ['id', '_id'])
         }
       },
       fromResponse(response) {
@@ -830,6 +872,26 @@ function createBasicCrudOperations({
   return operations
 }
 
+function createDeviceClassOperations() {
+  const operations = createBasicCrudOperations({
+    resource: '/digital-twin-types',
+    mapListQuery: mapDeviceClassToIotQuery,
+    mapWritePayload: mapDeviceClassToIotBody,
+    mapItem: mapIotDeviceClassToLegacy,
+    enableDeleteMany: true
+  })
+  const fromListResponse = operations.list.fromResponse
+
+  operations.list = {
+    ...operations.list,
+    fromResponse(response) {
+      return appendLegacyCameraDeviceClass(fromListResponse(response))
+    }
+  }
+
+  return operations
+}
+
 export const iotModuleSpecs = {
   area: {
     operations: createBasicCrudOperations({
@@ -925,13 +987,7 @@ export const iotModuleSpecs = {
     }
   },
   deviceClass: {
-    operations: createBasicCrudOperations({
-      resource: '/digital-twin-types',
-      mapListQuery: mapDeviceClassToIotQuery,
-      mapWritePayload: mapDeviceClassToIotBody,
-      mapItem: mapIotDeviceClassToLegacy,
-      enableDeleteMany: true
-    })
+    operations: createDeviceClassOperations()
   }
 }
 

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

@@ -119,6 +119,52 @@ describe('iotModuleSpecs deviceClass UI compatibility', () => {
 
     expect(response.data.rows[0].icon).toBe('tabler-current-panel')
   })
+
+  test('appends legacy virtual camera device class to v2 list responses', () => {
+    const response = deviceClass.list.fromResponse({
+      code: 0,
+      data: {
+        total: 1,
+        items: [
+          {
+            id: 'type-1',
+            typeCode: 'LIGHT',
+            name: '照明'
+          }
+        ]
+      }
+    })
+
+    expect(response.data.total).toBe(2)
+    expect(response.data.rows).toContainEqual({
+      _id: 'camera',
+      id: 'camera',
+      name: '摄像头',
+      icon: '摄像头监控',
+      type: 'camera'
+    })
+  })
+
+  test('does not duplicate legacy virtual camera device class when backend already returns it', () => {
+    const response = deviceClass.list.fromResponse({
+      code: 0,
+      data: {
+        total: 1,
+        items: [
+          {
+            id: 'camera',
+            name: '摄像头',
+            type: 'camera'
+          }
+        ]
+      }
+    })
+
+    const cameraRows = response.data.rows.filter(item => item._id === 'camera')
+
+    expect(response.data.total).toBe(1)
+    expect(cameraRows).toHaveLength(1)
+  })
 })
 
 describe('iotModuleSpecs departs hierarchy compatibility', () => {
@@ -189,6 +235,32 @@ describe('iotModuleSpecs area space compatibility', () => {
 
     expect(response.data.rows[0].centerCoordinate).toEqual([12, 34])
   })
+
+  test('does not clear areaClassId on partial statistics sync updates', () => {
+    const request = area.updateOne.toRequest({
+      _id: '4f168184-9ef0-4068-b494-2ee861db0c08',
+      statisticsJson: '[{"componentName":"WeeklyEnergyConsumptionTrend"}]'
+    })
+
+    expect(request.url).toBe('/spaces/4f168184-9ef0-4068-b494-2ee861db0c08')
+    expect(request.method).toBe('patch')
+    expect(request.data.statisticsJson).toEqual([
+      { componentName: 'WeeklyEnergyConsumptionTrend' }
+    ])
+    expect(request.data.areaClassId).toBeUndefined()
+    expect(request.data.targetHierarchyId).toBeUndefined()
+    expect(request.data.code).toBeUndefined()
+    expect(request.data.spaceType).toBeUndefined()
+  })
+
+  test('keeps explicit areaClass clear on area updates', () => {
+    const request = area.updateOne.toRequest({
+      _id: '4f168184-9ef0-4068-b494-2ee861db0c08',
+      areaClass: ''
+    })
+
+    expect(request.data.areaClassId).toBeNull()
+  })
 })
 
 describe('iotModuleSpecs devices write compatibility', () => {