kuzzle-device-manager-types 2.8.0-dev.1 → 2.8.0-dev.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/modules/asset/types/AssetGroupContent.d.ts +5 -3
- package/dist/lib/modules/model/ModelService.d.ts +6 -1
- package/dist/lib/modules/model/ModelsConflicts.d.ts +9 -1
- package/dist/lib/modules/model/ModelsController.d.ts +6 -1
- package/dist/lib/modules/model/ModelsRegister.d.ts +14 -0
- package/dist/lib/modules/model/types/ModelApi.d.ts +40 -1
- package/dist/lib/modules/model/types/ModelContent.d.ts +125 -1
- package/dist/lib/modules/model/types/ModelDefinition.d.ts +91 -0
- package/dist/lib/modules/model/types/ModelEvents.d.ts +8 -1
- package/dist/lib/modules/plugin/DeviceManagerEngine.d.ts +11 -1
- package/dist/lib/modules/plugin/DeviceManagerPlugin.d.ts +54 -1
- package/dist/lib/modules/plugin/types/DeviceManagerConfiguration.d.ts +1 -0
- package/dist/lib/modules/shared/types/Models.d.ts +2 -1
- package/dist/tests/application/groups/Parking.d.ts +14 -0
- package/dist/tests/application/groups/index.d.ts +1 -0
- package/package.json +1 -1
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { KDocumentContent } from "kuzzle-sdk";
|
|
2
|
-
|
|
2
|
+
import { Metadata } from "lib/modules/shared";
|
|
3
|
+
export interface AssetsGroupsBody<TMetadata extends Metadata = Metadata> extends KDocumentContent {
|
|
3
4
|
name: string;
|
|
4
|
-
|
|
5
|
+
model?: string | null;
|
|
5
6
|
children: string[];
|
|
6
7
|
parent: string | null;
|
|
7
8
|
lastUpdate: number;
|
|
9
|
+
metadata?: TMetadata;
|
|
8
10
|
}
|
|
9
|
-
export type AssetsGroupContent =
|
|
11
|
+
export type AssetsGroupContent<TMetadata extends Metadata = any> = AssetsGroupsBody<TMetadata>;
|
|
@@ -2,7 +2,7 @@ import { KuzzleRequest } from "kuzzle";
|
|
|
2
2
|
import { JSONObject, KDocument, KHit, SearchResult } from "kuzzle-sdk";
|
|
3
3
|
import { DeviceManagerPlugin } from "../plugin";
|
|
4
4
|
import { BaseService, SearchParams } from "../shared";
|
|
5
|
-
import { AssetModelContent, DeviceModelContent, MeasureModelContent, MetadataDetails, MetadataGroups, MetadataMappings, TooltipModels } from "./types/ModelContent";
|
|
5
|
+
import { AssetModelContent, DeviceModelContent, GroupModelContent, MeasureModelContent, MetadataDetails, MetadataGroups, MetadataMappings, TooltipModels } from "./types/ModelContent";
|
|
6
6
|
import { SchemaObject } from "ajv";
|
|
7
7
|
import { MeasureValuesDetails } from "../measure";
|
|
8
8
|
import { NamedMeasures } from "../decoder";
|
|
@@ -13,20 +13,25 @@ export declare class ModelService extends BaseService {
|
|
|
13
13
|
writeAsset(engineGroup: string, model: string, metadataMappings: MetadataMappings, defaultMetadata: JSONObject, metadataDetails: MetadataDetails, metadataGroups: MetadataGroups, measures: NamedMeasures, tooltipModels: TooltipModels): Promise<KDocument<AssetModelContent>>;
|
|
14
14
|
private checkDefaultValues;
|
|
15
15
|
writeDevice(model: string, metadataMappings: MetadataMappings, defaultMetadata: JSONObject, metadataDetails: MetadataDetails, metadataGroups: MetadataGroups, measures: NamedMeasures): Promise<KDocument<DeviceModelContent>>;
|
|
16
|
+
writeGroup(engineGroup: string, model: string, metadataMappings: MetadataMappings, defaultMetadata: JSONObject, metadataDetails: MetadataDetails, metadataGroups: MetadataGroups): Promise<KDocument<GroupModelContent>>;
|
|
16
17
|
writeMeasure(type: string, valuesMappings: JSONObject, validationSchema?: SchemaObject, valuesDetails?: MeasureValuesDetails): Promise<KDocument<MeasureModelContent>>;
|
|
17
18
|
deleteAsset(_id: string): Promise<void>;
|
|
18
19
|
deleteDevice(_id: string): Promise<void>;
|
|
20
|
+
deleteGroup(_id: string): Promise<void>;
|
|
19
21
|
deleteMeasure(_id: string): Promise<void>;
|
|
20
22
|
listAsset(engineGroup: string): Promise<KDocument<AssetModelContent>[]>;
|
|
21
23
|
listDevices(): Promise<KDocument<DeviceModelContent>[]>;
|
|
24
|
+
listGroups(engineGroup: string): Promise<KDocument<GroupModelContent>[]>;
|
|
22
25
|
listMeasures(): Promise<KDocument<MeasureModelContent>[]>;
|
|
23
26
|
searchAssets(engineGroup: string, searchParams: Partial<SearchParams>): Promise<SearchResult<KHit<AssetModelContent>>>;
|
|
24
27
|
searchDevices(searchParams: Partial<SearchParams>): Promise<SearchResult<KHit<DeviceModelContent>>>;
|
|
28
|
+
searchGroups(engineGroup: string, searchParams: Partial<SearchParams>): Promise<SearchResult<KHit<GroupModelContent>>>;
|
|
25
29
|
searchMeasures(searchParams: Partial<SearchParams>): Promise<SearchResult<KHit<MeasureModelContent>>>;
|
|
26
30
|
assetExists(model: string): Promise<boolean>;
|
|
27
31
|
deviceExists(model: string): Promise<boolean>;
|
|
28
32
|
getAsset(engineGroup: string, model: string): Promise<KDocument<AssetModelContent>>;
|
|
29
33
|
getDevice(model: string): Promise<KDocument<DeviceModelContent>>;
|
|
34
|
+
getGroup(model: string): Promise<KDocument<GroupModelContent>>;
|
|
30
35
|
getMeasure(type: string): Promise<KDocument<MeasureModelContent>>;
|
|
31
36
|
/**
|
|
32
37
|
* Update an asset model
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { TwinModelContent, TwinType } from "../plugin";
|
|
2
|
-
import { MeasureModelContent } from "./exports";
|
|
2
|
+
import { GroupModelContent, MeasureModelContent } from "./exports";
|
|
3
3
|
export type ConflictChunk = {
|
|
4
4
|
sourceModel: string;
|
|
5
5
|
newModel: string;
|
|
@@ -20,6 +20,14 @@ export type MappingsConflict = {
|
|
|
20
20
|
* @returns An array of ConflictChunk between current twins and the new twin
|
|
21
21
|
*/
|
|
22
22
|
export declare function getTwinConflicts<TDigitalTwin extends TwinModelContent>(twinType: TwinType, models: TDigitalTwin[], additional: TDigitalTwin): ConflictChunk[];
|
|
23
|
+
/**
|
|
24
|
+
* Return every conflicts between the mappings of group models and a new group model
|
|
25
|
+
*
|
|
26
|
+
* @param groups The already present group models
|
|
27
|
+
* @param additional The new group model
|
|
28
|
+
* @returns An array of ConflictChunk between current groups and the new group
|
|
29
|
+
*/
|
|
30
|
+
export declare function getGroupConflicts(measures: GroupModelContent[], additional: GroupModelContent): ConflictChunk[];
|
|
23
31
|
/**
|
|
24
32
|
* Return every conflicts between the mappings of measure models and a new measure model
|
|
25
33
|
*
|
|
@@ -1,24 +1,29 @@
|
|
|
1
1
|
import { ControllerDefinition, KuzzleRequest } from "kuzzle";
|
|
2
2
|
import { ModelService } from "./ModelService";
|
|
3
|
-
import { ApiModelWriteAssetResult, ApiModelWriteDeviceResult, ApiModelWriteMeasureResult, ApiModelUpdateAssetResult, ApiModelDeleteAssetResult, ApiModelDeleteDeviceResult, ApiModelDeleteMeasureResult, ApiModelListAssetsResult, ApiModelListDevicesResult, ApiModelListMeasuresResult, ApiModelGetAssetResult, ApiModelGetDeviceResult, ApiModelGetMeasureResult, ApiModelSearchAssetsResult, ApiModelSearchDevicesResult, ApiModelSearchMeasuresResult } from "./types/ModelApi";
|
|
3
|
+
import { ApiModelWriteAssetResult, ApiModelWriteDeviceResult, ApiModelWriteMeasureResult, ApiModelUpdateAssetResult, ApiModelDeleteAssetResult, ApiModelDeleteDeviceResult, ApiModelDeleteMeasureResult, ApiModelListAssetsResult, ApiModelListDevicesResult, ApiModelListMeasuresResult, ApiModelGetAssetResult, ApiModelGetDeviceResult, ApiModelGetMeasureResult, ApiModelSearchAssetsResult, ApiModelSearchDevicesResult, ApiModelSearchMeasuresResult, ApiModelDeleteGroupResult, ApiModelGetGroupResult, ApiModelListGroupsResult, ApiModelSearchGroupsResult, ApiModelWriteGroupResult } from "./types/ModelApi";
|
|
4
4
|
export declare class ModelsController {
|
|
5
5
|
private modelService;
|
|
6
6
|
definition: ControllerDefinition;
|
|
7
7
|
constructor(modelService: ModelService);
|
|
8
8
|
getAsset(request: KuzzleRequest): Promise<ApiModelGetAssetResult>;
|
|
9
9
|
getDevice(request: KuzzleRequest): Promise<ApiModelGetDeviceResult>;
|
|
10
|
+
getGroup(request: KuzzleRequest): Promise<ApiModelGetGroupResult>;
|
|
10
11
|
getMeasure(request: KuzzleRequest): Promise<ApiModelGetMeasureResult>;
|
|
11
12
|
writeAsset(request: KuzzleRequest): Promise<ApiModelWriteAssetResult>;
|
|
12
13
|
writeDevice(request: KuzzleRequest): Promise<ApiModelWriteDeviceResult>;
|
|
14
|
+
writeGroup(request: KuzzleRequest): Promise<ApiModelWriteGroupResult>;
|
|
13
15
|
writeMeasure(request: KuzzleRequest): Promise<ApiModelWriteMeasureResult>;
|
|
14
16
|
deleteAsset(request: KuzzleRequest): Promise<ApiModelDeleteAssetResult>;
|
|
15
17
|
deleteDevice(request: KuzzleRequest): Promise<ApiModelDeleteDeviceResult>;
|
|
18
|
+
deleteGroup(request: KuzzleRequest): Promise<ApiModelDeleteGroupResult>;
|
|
16
19
|
deleteMeasure(request: KuzzleRequest): Promise<ApiModelDeleteMeasureResult>;
|
|
17
20
|
listAssets(request: KuzzleRequest): Promise<ApiModelListAssetsResult>;
|
|
18
21
|
listDevices(): Promise<ApiModelListDevicesResult>;
|
|
22
|
+
listGroups(request: KuzzleRequest): Promise<ApiModelListGroupsResult>;
|
|
19
23
|
listMeasures(): Promise<ApiModelListMeasuresResult>;
|
|
20
24
|
searchAssets(request: KuzzleRequest): Promise<ApiModelSearchAssetsResult>;
|
|
21
25
|
searchDevices(request: KuzzleRequest): Promise<ApiModelSearchDevicesResult>;
|
|
26
|
+
searchGroups(request: KuzzleRequest): Promise<ApiModelSearchGroupsResult>;
|
|
22
27
|
searchMeasures(request: KuzzleRequest): Promise<ApiModelSearchMeasuresResult>;
|
|
23
28
|
updateAsset(request: KuzzleRequest): Promise<ApiModelUpdateAssetResult>;
|
|
24
29
|
}
|
|
@@ -8,6 +8,7 @@ export declare class ModelsRegister {
|
|
|
8
8
|
private context;
|
|
9
9
|
private assetModels;
|
|
10
10
|
private deviceModels;
|
|
11
|
+
private groupModels;
|
|
11
12
|
private measureModels;
|
|
12
13
|
private get sdk();
|
|
13
14
|
init(plugin: DeviceManagerPlugin): void;
|
|
@@ -38,6 +39,19 @@ export declare class ModelsRegister {
|
|
|
38
39
|
* @throws PluginImplementationError if the model name is not in PascalCase.
|
|
39
40
|
*/
|
|
40
41
|
registerDevice(model: string, measures: NamedMeasures, metadataMappings?: MetadataMappings, defaultMetadata?: JSONObject, metadataDetails?: MetadataDetails, metadataGroups?: MetadataGroups): void;
|
|
42
|
+
/**
|
|
43
|
+
* Registers a group model.
|
|
44
|
+
*
|
|
45
|
+
*
|
|
46
|
+
* @param engineGroup - The engine group name.
|
|
47
|
+
* @param model - The name of the group model, which must be in PascalCase.
|
|
48
|
+
* @param metadataMappings - The metadata mappings for the model, defaults to an empty object.
|
|
49
|
+
* @param defaultMetadata - The default metadata values for the model, defaults to an empty object.
|
|
50
|
+
* @param metadataDetails - Optional detailed metadata descriptions, localizations and definition.
|
|
51
|
+
* @param metadataGroups - Optional groups for organizing metadata, with localizations.
|
|
52
|
+
* @throws PluginImplementationError if the model name is not in PascalCase.
|
|
53
|
+
*/
|
|
54
|
+
registerGroup(engineGroup: string, model: string, metadataMappings?: MetadataMappings, defaultMetadata?: JSONObject, metadataDetails?: MetadataDetails, metadataGroups?: MetadataGroups): void;
|
|
41
55
|
registerMeasure(type: string, measureDefinition: MeasureDefinition): void;
|
|
42
56
|
private load;
|
|
43
57
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { JSONObject, KDocument, KHit, SearchResult } from "kuzzle-sdk";
|
|
2
|
-
import { AssetModelContent, DeviceModelContent, MeasureModelContent, MetadataDetails, MetadataGroups, MetadataMappings, TooltipModels } from "./ModelContent";
|
|
2
|
+
import { AssetModelContent, DeviceModelContent, GroupModelContent, MeasureModelContent, MetadataDetails, MetadataGroups, MetadataMappings, TooltipModels } from "./ModelContent";
|
|
3
3
|
import { SchemaObject } from "ajv";
|
|
4
4
|
import { MeasureValuesDetails } from "../../measure/types/MeasureDefinition";
|
|
5
5
|
interface ModelsControllerRequest {
|
|
@@ -16,6 +16,11 @@ export interface ApiModelGetDeviceRequest extends ModelsControllerRequest {
|
|
|
16
16
|
model: string;
|
|
17
17
|
}
|
|
18
18
|
export type ApiModelGetDeviceResult = KDocument<DeviceModelContent>;
|
|
19
|
+
export interface ApiModelGetGroupRequest extends ModelsControllerRequest {
|
|
20
|
+
action: "getGroup";
|
|
21
|
+
model: string;
|
|
22
|
+
}
|
|
23
|
+
export type ApiModelGetGroupResult = KDocument<GroupModelContent>;
|
|
19
24
|
export interface ApiModelGetMeasureRequest extends ModelsControllerRequest {
|
|
20
25
|
action: "getMeasure";
|
|
21
26
|
type: string;
|
|
@@ -47,6 +52,18 @@ export interface ApiModelWriteDeviceRequest extends ModelsControllerRequest {
|
|
|
47
52
|
};
|
|
48
53
|
}
|
|
49
54
|
export type ApiModelWriteDeviceResult = KDocument<DeviceModelContent>;
|
|
55
|
+
export interface ApiModelWriteGroupRequest extends ModelsControllerRequest {
|
|
56
|
+
action: "writeGroup";
|
|
57
|
+
body: {
|
|
58
|
+
engineGroup: string;
|
|
59
|
+
model: string;
|
|
60
|
+
metadataDetails?: MetadataDetails;
|
|
61
|
+
metadataGroups?: MetadataGroups;
|
|
62
|
+
metadataMappings?: MetadataMappings;
|
|
63
|
+
defaultValues?: JSONObject;
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
export type ApiModelWriteGroupResult = KDocument<GroupModelContent>;
|
|
50
67
|
export interface ApiModelWriteMeasureRequest extends ModelsControllerRequest {
|
|
51
68
|
action: "writeMeasure";
|
|
52
69
|
body: {
|
|
@@ -81,6 +98,11 @@ export interface ApiModelDeleteDeviceRequest extends ModelsControllerRequest {
|
|
|
81
98
|
_id: string;
|
|
82
99
|
}
|
|
83
100
|
export type ApiModelDeleteDeviceResult = void;
|
|
101
|
+
export interface ApiModelDeleteGroupRequest extends ModelsControllerRequest {
|
|
102
|
+
action: "deleteGroup";
|
|
103
|
+
_id: string;
|
|
104
|
+
}
|
|
105
|
+
export type ApiModelDeleteGroupResult = void;
|
|
84
106
|
export interface ApiModelDeleteMeasureRequest extends ModelsControllerRequest {
|
|
85
107
|
action: "deleteMeasure";
|
|
86
108
|
_id: string;
|
|
@@ -101,6 +123,14 @@ export type ApiModelListDevicesResult = {
|
|
|
101
123
|
models: KDocument<DeviceModelContent>[];
|
|
102
124
|
total: number;
|
|
103
125
|
};
|
|
126
|
+
export interface ApiModelListGroupsRequest extends ModelsControllerRequest {
|
|
127
|
+
action: "listGroups";
|
|
128
|
+
engineGroup: string;
|
|
129
|
+
}
|
|
130
|
+
export type ApiModelListGroupsResult = {
|
|
131
|
+
models: KDocument<GroupModelContent>[];
|
|
132
|
+
total: number;
|
|
133
|
+
};
|
|
104
134
|
export interface ApiModelListMeasuresRequest extends ModelsControllerRequest {
|
|
105
135
|
action: "listMeasures";
|
|
106
136
|
}
|
|
@@ -125,6 +155,15 @@ export interface ApiModelSearchDevicesRequest extends ModelsControllerRequest {
|
|
|
125
155
|
body?: JSONObject;
|
|
126
156
|
}
|
|
127
157
|
export type ApiModelSearchDevicesResult = SearchResult<KHit<DeviceModelContent>>;
|
|
158
|
+
export interface ApiModelSearchGroupsRequest extends ModelsControllerRequest {
|
|
159
|
+
action: "searchGroups";
|
|
160
|
+
engineGroup: string;
|
|
161
|
+
from?: number;
|
|
162
|
+
size?: number;
|
|
163
|
+
scrollTTL?: string;
|
|
164
|
+
body?: JSONObject;
|
|
165
|
+
}
|
|
166
|
+
export type ApiModelSearchGroupsResult = SearchResult<KHit<GroupModelContent>>;
|
|
128
167
|
export interface ApiModelSearchMeasuresRequest extends ModelsControllerRequest {
|
|
129
168
|
action: "searchMeasures";
|
|
130
169
|
from?: number;
|
|
@@ -356,4 +356,128 @@ export interface DeviceModelContent extends KDocumentContent {
|
|
|
356
356
|
measures: NamedMeasures;
|
|
357
357
|
};
|
|
358
358
|
}
|
|
359
|
-
export
|
|
359
|
+
export interface GroupModelContent extends KDocumentContent {
|
|
360
|
+
type: "group";
|
|
361
|
+
engineGroup: string;
|
|
362
|
+
group: {
|
|
363
|
+
/**
|
|
364
|
+
* Name of the model
|
|
365
|
+
*/
|
|
366
|
+
model: string;
|
|
367
|
+
/**
|
|
368
|
+
* Metadata mappings.
|
|
369
|
+
*
|
|
370
|
+
* @example
|
|
371
|
+
* {
|
|
372
|
+
* "company": {
|
|
373
|
+
* "properties": {
|
|
374
|
+
* "name": { "type": "keyword" },
|
|
375
|
+
* }
|
|
376
|
+
* }
|
|
377
|
+
* }
|
|
378
|
+
*/
|
|
379
|
+
metadataMappings: MetadataMappings;
|
|
380
|
+
/**
|
|
381
|
+
* Default values for metadata.
|
|
382
|
+
*
|
|
383
|
+
* @example
|
|
384
|
+
* {
|
|
385
|
+
* "company.name": "Firebird"
|
|
386
|
+
* }
|
|
387
|
+
*/
|
|
388
|
+
defaultMetadata: JSONObject;
|
|
389
|
+
/**
|
|
390
|
+
* Metadata details
|
|
391
|
+
* @example
|
|
392
|
+
* {
|
|
393
|
+
* "extTemp": {
|
|
394
|
+
* "group": "buildingEnv",
|
|
395
|
+
* "locales": {
|
|
396
|
+
* "en": {
|
|
397
|
+
* "friendlyName": "External temperature",
|
|
398
|
+
* "description": "Building external temperature"
|
|
399
|
+
* },
|
|
400
|
+
* "fr": {
|
|
401
|
+
* "friendlyName": "Température extérieure",
|
|
402
|
+
* "description": "Température à l'exterieur du bâtiment"
|
|
403
|
+
* },
|
|
404
|
+
* },
|
|
405
|
+
* "editorHint": {
|
|
406
|
+
* "readOnly": true,
|
|
407
|
+
* "type": EditorHintEnum.OPTION_SELECTOR,
|
|
408
|
+
* "values": ["red", "blue"],
|
|
409
|
+
* "customValueAllowed": true,
|
|
410
|
+
* },
|
|
411
|
+
* },
|
|
412
|
+
* }
|
|
413
|
+
*/
|
|
414
|
+
metadataDetails?: MetadataDetails;
|
|
415
|
+
/**
|
|
416
|
+
* Metadata groups list
|
|
417
|
+
* @example
|
|
418
|
+
* {
|
|
419
|
+
* "buildingEnv": {
|
|
420
|
+
* "locales": {
|
|
421
|
+
* "en": {
|
|
422
|
+
* "groupFriendlyName": "Building environment",
|
|
423
|
+
* "description": "The building environment"
|
|
424
|
+
* },
|
|
425
|
+
* "fr": {
|
|
426
|
+
* "groupFriendlyName": "Environnement du bâtiment",
|
|
427
|
+
* "description": "L'environnement du bâtiment"
|
|
428
|
+
* }
|
|
429
|
+
* }
|
|
430
|
+
* }
|
|
431
|
+
* }
|
|
432
|
+
*/
|
|
433
|
+
metadataGroups?: MetadataGroups;
|
|
434
|
+
/**
|
|
435
|
+
* List of tooltip models for this asset model
|
|
436
|
+
*
|
|
437
|
+
* @example
|
|
438
|
+
* [
|
|
439
|
+
* "defaultTooltipKey": {
|
|
440
|
+
* "tooltipLabel": "Default tooltip model",
|
|
441
|
+
* "content": [
|
|
442
|
+
* {
|
|
443
|
+
* "metadataPath": "geolocation",
|
|
444
|
+
* "label": {
|
|
445
|
+
* "locales": {
|
|
446
|
+
* "en": {
|
|
447
|
+
* "description": "",
|
|
448
|
+
* "friendlyName": "Container position"
|
|
449
|
+
* },
|
|
450
|
+
* "fr": {
|
|
451
|
+
* "description": "",
|
|
452
|
+
* "friendlyName": "Position du conteneur"
|
|
453
|
+
* }
|
|
454
|
+
* }
|
|
455
|
+
* },
|
|
456
|
+
* "category": "metadata"
|
|
457
|
+
* },
|
|
458
|
+
* {
|
|
459
|
+
* "measureValuePath": "externalTemperature",
|
|
460
|
+
* "measureSlot": "externalTemperature",
|
|
461
|
+
* "label": {
|
|
462
|
+
* "locales": {
|
|
463
|
+
* "en": {
|
|
464
|
+
* "description": "",
|
|
465
|
+
* "friendlyName": "External temperature"
|
|
466
|
+
* },
|
|
467
|
+
* "fr": {
|
|
468
|
+
* "description": "",
|
|
469
|
+
* "friendlyName": "Température extérieure"
|
|
470
|
+
* }
|
|
471
|
+
* }
|
|
472
|
+
* },
|
|
473
|
+
* "category": "measure",
|
|
474
|
+
* "suffix": "°C"
|
|
475
|
+
* }
|
|
476
|
+
* ]
|
|
477
|
+
* }
|
|
478
|
+
* ]
|
|
479
|
+
*/
|
|
480
|
+
tooltipModels?: TooltipModels;
|
|
481
|
+
};
|
|
482
|
+
}
|
|
483
|
+
export type ModelContent = MeasureModelContent | AssetModelContent | DeviceModelContent | GroupModelContent;
|
|
@@ -196,3 +196,94 @@ export type DeviceModelDefinition = {
|
|
|
196
196
|
*/
|
|
197
197
|
metadataGroups?: MetadataGroups;
|
|
198
198
|
};
|
|
199
|
+
/**
|
|
200
|
+
* Define a group model
|
|
201
|
+
*
|
|
202
|
+
* @example
|
|
203
|
+
* {
|
|
204
|
+
* metadataMappings: {
|
|
205
|
+
* position: { type: "geo_point" },
|
|
206
|
+
* },
|
|
207
|
+
* defaultMetadata: {
|
|
208
|
+
* position: {
|
|
209
|
+
* lat: 41.12,
|
|
210
|
+
* lon: -71.34
|
|
211
|
+
* }
|
|
212
|
+
* },
|
|
213
|
+
* metadataDetails: {
|
|
214
|
+
* "position": {
|
|
215
|
+
* "group": "geolocation",
|
|
216
|
+
* "locales": {
|
|
217
|
+
* "en": {
|
|
218
|
+
* "friendlyName": "Parking position",
|
|
219
|
+
* "description": "The coordinates of the parking"
|
|
220
|
+
* },
|
|
221
|
+
* "fr": {
|
|
222
|
+
* "friendlyName": "Position du parking",
|
|
223
|
+
* "description": "Les coordonnées GPS du parking"
|
|
224
|
+
* }
|
|
225
|
+
* },
|
|
226
|
+
* },
|
|
227
|
+
* },
|
|
228
|
+
* metadataGroups: {
|
|
229
|
+
* geolocation: {
|
|
230
|
+
* locales: {
|
|
231
|
+
* en: {
|
|
232
|
+
* groupFriendlyName: "Parking geolocation",
|
|
233
|
+
* description: "The parking geolocation"
|
|
234
|
+
* },
|
|
235
|
+
* fr: {
|
|
236
|
+
* groupFriendlyName: "Localisation du parking",
|
|
237
|
+
* description: "La localisation du parking"
|
|
238
|
+
* }
|
|
239
|
+
* }
|
|
240
|
+
* }
|
|
241
|
+
* },
|
|
242
|
+
* tooltipModels: {
|
|
243
|
+
* "defaultTooltipKey": {
|
|
244
|
+
* "tooltipLabel": "Default Tooltip Model",
|
|
245
|
+
* "content": [
|
|
246
|
+
* {
|
|
247
|
+
* "category": "metadata",
|
|
248
|
+
* "label": {
|
|
249
|
+
* "locales": {
|
|
250
|
+
* "en": {
|
|
251
|
+
* "friendlyName": "Parking position",
|
|
252
|
+
* "description": ""
|
|
253
|
+
* },
|
|
254
|
+
* "fr": {
|
|
255
|
+
* "friendlyName": "Position du parking",
|
|
256
|
+
* "description": ""
|
|
257
|
+
* }
|
|
258
|
+
* }
|
|
259
|
+
* },
|
|
260
|
+
* "metadataPath": "position"
|
|
261
|
+
* },
|
|
262
|
+
* ]
|
|
263
|
+
* }
|
|
264
|
+
* }
|
|
265
|
+
* }
|
|
266
|
+
*
|
|
267
|
+
*/
|
|
268
|
+
export type GroupModelDefinition = {
|
|
269
|
+
/**
|
|
270
|
+
* Metadata mappings definition
|
|
271
|
+
*/
|
|
272
|
+
metadataMappings?: MetadataMappings;
|
|
273
|
+
/**
|
|
274
|
+
* Default metadata values
|
|
275
|
+
*/
|
|
276
|
+
defaultMetadata?: JSONObject;
|
|
277
|
+
/**
|
|
278
|
+
* Metadata details including tanslations and group.
|
|
279
|
+
*/
|
|
280
|
+
metadataDetails?: MetadataDetails;
|
|
281
|
+
/**
|
|
282
|
+
* Metadata groups
|
|
283
|
+
*/
|
|
284
|
+
metadataGroups?: MetadataGroups;
|
|
285
|
+
/**
|
|
286
|
+
* Tooltip models
|
|
287
|
+
*/
|
|
288
|
+
tooltipModels?: TooltipModels;
|
|
289
|
+
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AssetModelContent, DeviceModelContent, MeasureModelContent } from "./ModelContent";
|
|
1
|
+
import { AssetModelContent, DeviceModelContent, GroupModelContent, MeasureModelContent } from "./ModelContent";
|
|
2
2
|
export type AskModelAssetGet = {
|
|
3
3
|
name: "ask:device-manager:model:asset:get";
|
|
4
4
|
payload: {
|
|
@@ -21,3 +21,10 @@ export type AskModelMeasureGet = {
|
|
|
21
21
|
};
|
|
22
22
|
result: MeasureModelContent;
|
|
23
23
|
};
|
|
24
|
+
export type AskModelGroupGet = {
|
|
25
|
+
name: "ask:device-manager:model:group:get";
|
|
26
|
+
payload: {
|
|
27
|
+
model: string;
|
|
28
|
+
};
|
|
29
|
+
result: GroupModelContent;
|
|
30
|
+
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Backend, KDocumentContent, Plugin } from "kuzzle";
|
|
2
2
|
import { AbstractEngine, ConfigManager, EngineContent } from "kuzzle-plugin-commons";
|
|
3
|
-
import { AssetModelContent, DeviceModelContent, MeasureModelContent } from "../model";
|
|
3
|
+
import { AssetModelContent, DeviceModelContent, GroupModelContent, MeasureModelContent } from "../model";
|
|
4
4
|
import { DeviceManagerPlugin } from "./DeviceManagerPlugin";
|
|
5
5
|
import { DeviceManagerConfiguration } from "./types/DeviceManagerConfiguration";
|
|
6
6
|
import { InternalCollection } from "./types/InternalCollection";
|
|
@@ -35,6 +35,7 @@ export type AskEngineUpdateConflict = {
|
|
|
35
35
|
models: TwinModelContent[];
|
|
36
36
|
};
|
|
37
37
|
measuresModels?: MeasureModelContent[];
|
|
38
|
+
groupModels?: GroupModelContent[];
|
|
38
39
|
};
|
|
39
40
|
result: ConflictChunk[];
|
|
40
41
|
};
|
|
@@ -54,6 +55,14 @@ export declare class DeviceManagerEngine extends AbstractEngine<DeviceManagerPlu
|
|
|
54
55
|
* @returns An array of conflict chunk
|
|
55
56
|
*/
|
|
56
57
|
private doesTwinUpdateConflicts;
|
|
58
|
+
/**
|
|
59
|
+
* Return conflicts between the new and already present group models
|
|
60
|
+
*
|
|
61
|
+
* @param groupModels The already present group models
|
|
62
|
+
* @param additionalGroups The new or updated group models
|
|
63
|
+
* @returns An array of ConflictChunk
|
|
64
|
+
*/
|
|
65
|
+
private doesGroupsUpdateConflicts;
|
|
57
66
|
/**
|
|
58
67
|
* Return conflicts between the new and already present measure models
|
|
59
68
|
*
|
|
@@ -166,6 +175,7 @@ export declare class DeviceManagerEngine extends AbstractEngine<DeviceManagerPlu
|
|
|
166
175
|
* @returns The complete ES mappings produced by merging models mappings
|
|
167
176
|
*/
|
|
168
177
|
private getMeasuresMappings;
|
|
178
|
+
getAssetGroupsMappingFromDB(): Promise<any>;
|
|
169
179
|
/**
|
|
170
180
|
* Retrieve a certain type of models associated to an engine
|
|
171
181
|
*
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Plugin, PluginContext } from "kuzzle";
|
|
2
2
|
import { JSONObject } from "kuzzle-sdk";
|
|
3
3
|
import { MeasureDefinition } from "../measure";
|
|
4
|
-
import { AssetModelDefinition, DeviceModelDefinition } from "../model";
|
|
4
|
+
import { AssetModelDefinition, DeviceModelDefinition, GroupModelDefinition } from "../model";
|
|
5
5
|
import { DeviceManagerConfiguration } from "./types/DeviceManagerConfiguration";
|
|
6
6
|
export declare class DeviceManagerPlugin extends Plugin {
|
|
7
7
|
config: DeviceManagerConfiguration;
|
|
@@ -177,6 +177,59 @@ export declare class DeviceManagerPlugin extends Plugin {
|
|
|
177
177
|
* ```
|
|
178
178
|
*/
|
|
179
179
|
registerDevice: (model: string, definition: DeviceModelDefinition) => void;
|
|
180
|
+
/**
|
|
181
|
+
* Register a group.
|
|
182
|
+
*
|
|
183
|
+
* @param model Name of the group model
|
|
184
|
+
* @param definition Object containing the group model definition, including:
|
|
185
|
+
* - metadataMappings: Metadata mappings definition
|
|
186
|
+
* - defaultMetadata: Default metadata values
|
|
187
|
+
* - metadataDetails: Localizations, detailed metadata descriptions and definition
|
|
188
|
+
* - metadataGroups: Groups for organizing metadata, with localizations
|
|
189
|
+
*
|
|
190
|
+
* @example
|
|
191
|
+
* ```
|
|
192
|
+
* deviceManager.models.registerGroup(
|
|
193
|
+
* "Parking",
|
|
194
|
+
* {
|
|
195
|
+
* metadataMappings: {
|
|
196
|
+
* geolocation: { type: "geo_point" },
|
|
197
|
+
* },
|
|
198
|
+
* defaultMetadata: {
|
|
199
|
+
*
|
|
200
|
+
* },
|
|
201
|
+
* metadataDetails: {
|
|
202
|
+
* geolocation: {
|
|
203
|
+
* group: "access",
|
|
204
|
+
* locales: {
|
|
205
|
+
* en: {
|
|
206
|
+
* friendlyName: "Parking location",
|
|
207
|
+
* description: "GPS position of the parking"
|
|
208
|
+
* },
|
|
209
|
+
* fr: {
|
|
210
|
+
* friendlyName: "Emplacement du parking",
|
|
211
|
+
* description: "Position GPS du parking"
|
|
212
|
+
* }
|
|
213
|
+
* }
|
|
214
|
+
* }
|
|
215
|
+
* },
|
|
216
|
+
* metadataGroups: {
|
|
217
|
+
* access: {
|
|
218
|
+
* locales: {
|
|
219
|
+
* en: {
|
|
220
|
+
* groupFriendlyName: "Parking access info"
|
|
221
|
+
* },
|
|
222
|
+
* fr: {
|
|
223
|
+
* groupFriendlyName: "Information d'accès au parking"
|
|
224
|
+
* }
|
|
225
|
+
* }
|
|
226
|
+
* }
|
|
227
|
+
* }
|
|
228
|
+
* }
|
|
229
|
+
* );
|
|
230
|
+
* ```
|
|
231
|
+
*/
|
|
232
|
+
registerGroup: (engineGroup: string, model: string, definition: GroupModelDefinition) => void;
|
|
180
233
|
/**
|
|
181
234
|
* Register a new measure
|
|
182
235
|
*
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MeasureDefinition } from "../../measure";
|
|
2
|
-
import { AssetModelDefinition, DeviceModelDefinition } from "../../model";
|
|
2
|
+
import { AssetModelDefinition, DeviceModelDefinition, GroupModelDefinition } from "../../model";
|
|
3
3
|
interface ModelDefinition<Definition> {
|
|
4
4
|
/**
|
|
5
5
|
* Name of model
|
|
@@ -14,4 +14,5 @@ interface ModelDefinition<Definition> {
|
|
|
14
14
|
export type AssetModel = ModelDefinition<AssetModelDefinition>;
|
|
15
15
|
export type DeviceModel = ModelDefinition<DeviceModelDefinition>;
|
|
16
16
|
export type MeasureModel = ModelDefinition<MeasureDefinition>;
|
|
17
|
+
export type GroupModel = ModelDefinition<GroupModelDefinition>;
|
|
17
18
|
export {};
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { AssetsGroupContent } from "lib/modules/asset/exports";
|
|
2
|
+
import { GroupModel, Metadata } from "lib/modules/shared";
|
|
3
|
+
declare const modelName = "Parking";
|
|
4
|
+
export interface ParkingMetadata extends Metadata {
|
|
5
|
+
geolocation: {
|
|
6
|
+
lat: number;
|
|
7
|
+
lon: number;
|
|
8
|
+
};
|
|
9
|
+
}
|
|
10
|
+
export interface ParkingGroupContent extends AssetsGroupContent<ParkingMetadata> {
|
|
11
|
+
model: typeof modelName;
|
|
12
|
+
}
|
|
13
|
+
export declare const Parking: GroupModel;
|
|
14
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from "./Parking";
|